From bd03b38be0918837e147e969c6bb2014900009db Mon Sep 17 00:00:00 2001
From: Brijeshcr
Date: Sat, 8 Jul 2017 20:18:17 +0530
Subject: Revert "SCi2cDeps updated, Windows compatibility resolved"

---
 macros/ASTManagement/AST_ParseOperStruct.sci | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'macros/ASTManagement/AST_ParseOperStruct.sci')

diff --git a/macros/ASTManagement/AST_ParseOperStruct.sci b/macros/ASTManagement/AST_ParseOperStruct.sci
index cc992a9e..ce0bcc72 100644
--- a/macros/ASTManagement/AST_ParseOperStruct.sci
+++ b/macros/ASTManagement/AST_ParseOperStruct.sci
@@ -62,7 +62,6 @@ LabelFunctName = 'Operator: ';
 FunctionName = stripblanks(part(buffstring,length(LabelFunctName)+1:length(buffstring)));
 // Generate the proper function name.
 FunctionName  = Operator2FunName(FunctionName);
-<<<<<<< HEAD
 PrintStringInfo(' '+FunctionName,ReportFileName,'file','y');
 
 if (FunctionName == 'OpLogAnd' | FunctionName=='OpLogOr')
@@ -74,8 +73,6 @@ if (FunctionName == 'OpLogAnd' | FunctionName=='OpLogOr')
     //RhsField = AST_PopASTStack();
     return ;
 end
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 // ------------------------------
 // --- Read input parameters. ---
-- 
cgit