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

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

diff --git a/macros/ASTManagement/%funcall_string.sci b/macros/ASTManagement/%funcall_string.sci
index 449cc744..fc4b929b 100644
--- a/macros/ASTManagement/%funcall_string.sci
+++ b/macros/ASTManagement/%funcall_string.sci
@@ -8,17 +8,13 @@ function txt=%funcall_string(F)
 // Modified By: Ukasha Noor
 
 
-<<<<<<< HEAD
 if F.name <> 'disp'
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 txt=['Funcall  : '+F.name
      '  #lhs   : '+string(F.lhsnb)
      '  Rhs    : '
      '      '+objectlist2string(F.rhs)
      'EndFuncall'
     ]
-<<<<<<< HEAD
 else
 txt=['Funcall  : '+F.name
      '  #lhs   : '+'0'
@@ -27,6 +23,4 @@ txt=['Funcall  : '+F.name
      'EndFuncall'
     ]
 end
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 endfunction
-- 
cgit