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/SymbolTable/ST_AnalyzeScope.sci | 4 ----
 macros/SymbolTable/names               | 3 ---
 2 files changed, 7 deletions(-)

(limited to 'macros/SymbolTable')

diff --git a/macros/SymbolTable/ST_AnalyzeScope.sci b/macros/SymbolTable/ST_AnalyzeScope.sci
index f3b041a..8389c09 100644
--- a/macros/SymbolTable/ST_AnalyzeScope.sci
+++ b/macros/SymbolTable/ST_AnalyzeScope.sci
@@ -84,10 +84,6 @@ for cntout = 1:NOutArg
       // #RNU_RES_E
       OutArg(cntout).Scope     = 'Local';
    end
-<<<<<<< HEAD
-=======
-   
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
    // #RNU_RES_B
    // --- Check in global symbol table. ---
    // #RNU_RES_E
diff --git a/macros/SymbolTable/names b/macros/SymbolTable/names
index 2ce0db0..c2efc84 100644
--- a/macros/SymbolTable/names
+++ b/macros/SymbolTable/names
@@ -6,10 +6,7 @@ ST_GetInArgInfo
 ST_GetSymbolInfo
 ST_InsForCntVars
 ST_InsOutArg
-<<<<<<< HEAD
 ST_InsOutArg_Dup
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 ST_Load
 ST_MatchSymbol
 ST_Save
-- 
cgit