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/%operatio_string.sci | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'macros/ASTManagement/%operatio_string.sci')

diff --git a/macros/ASTManagement/%operatio_string.sci b/macros/ASTManagement/%operatio_string.sci
index 2a3554d..cc18e91 100644
--- a/macros/ASTManagement/%operatio_string.sci
+++ b/macros/ASTManagement/%operatio_string.sci
@@ -4,17 +4,13 @@ function txt=%operatio_string(O)
 //fields:
 //     operands: a list
 //     operator: a string
-<<<<<<< HEAD
 if O.operator <> 'rc' & O.operator <> 'cc'
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
   txt=['Operation'
        '   Operands:'
        '      '+objectlist2string(O.operands)
        '   Operator: '+O.operator
        'EndOperation'
       ]
-<<<<<<< HEAD
 elseif O.operator == 'rc'
   txt=['   Operands:'
        '      '+objectlist2string(O.operands)
@@ -27,6 +23,3 @@ elseif O.operator == 'cc'
       ]
 end
 endfunction
-=======
-endfunction
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
-- 
cgit