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 | 4 ----
 1 file changed, 4 deletions(-)

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

diff --git a/macros/ASTManagement/_operatio_string.sci b/macros/ASTManagement/_operatio_string.sci
index 76753868..e9332337 100644
--- a/macros/ASTManagement/_operatio_string.sci
+++ b/macros/ASTManagement/_operatio_string.sci
@@ -10,8 +10,4 @@ function txt=%operatio_string(O)
        '   Operator: '+O.operator
        'EndOperation'
       ]
-<<<<<<< HEAD
 endfunction
-=======
-endfunction
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
-- 
cgit