From 39874e472e540ca1bb923b97b52900e1d60439cc 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"

---
 2.3-1/etc/scilab2c.start | 9 ---------
 1 file changed, 9 deletions(-)

(limited to '2.3-1/etc')

diff --git a/2.3-1/etc/scilab2c.start b/2.3-1/etc/scilab2c.start
index ff243e98..91a5861e 100644
--- a/2.3-1/etc/scilab2c.start
+++ b/2.3-1/etc/scilab2c.start
@@ -20,21 +20,12 @@ sci2c_GenFunctionslib    = lib(pathmacros + "GeneralFunctions"   + filesep());
 sci2c_SymbolTablelib     = lib(pathmacros + "SymbolTable"        + filesep());
 sci2c_ToolInitlib        = lib(pathmacros + "ToolInitialization" + filesep());
 sci2c_finDeps            = lib(pathmacros + "findDeps"           + filesep());
-<<<<<<< HEAD
 sci2c_AVRlib	    	 = lib(pathmacros + "Hardware\AVR"       + filesep());
 sci2c_RPilib    		 = lib(pathmacros + "Hardware\RasberryPi"+ filesep());
 sci2c_ScilabArduinolib	 = lib(pathmacros + "Scilab-Arduino"     + filesep());
 sci2c_CVCorelib	     	 = lib(pathmacros + "ImageProcessing\core" + filesep());
 sci2c_CVHighguilib    	 = lib(pathmacros + "ImageProcessing\highgui" + filesep());
 sci2c_CVImgproclib  	 = lib(pathmacros + "ImageProcessing\imgproc" + filesep());
-=======
-sci2c_AVRlib		 	 = lib(pathmacros + "Hardware\AVR"       + filesep());
-sci2c_RPilib		 	 = lib(pathmacros + "Hardware\RasberryPi"+ filesep());
-sci2c_ScilabArduinolib	 = lib(pathmacros + "Scilab-Arduino"     + filesep());
-sci2c_CVCorelib	     	 = lib(pathmacros + "ImageProcessing\core" + filesep());
-sci2c_CVHighguilib    	 = lib(pathmacros + "ImageProcessing\highgui" + filesep());
-sci2c_CVImgproclib	     = lib(pathmacros + "ImageProcessing\imgproc" + filesep());
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 clear pathmacros;
 
 // Load and add help chapter
-- 
cgit