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/src/c/elementaryFunctions/includes/linspace.h       | 5 -----
 2.3-1/src/c/elementaryFunctions/interfaces/int_linspace.h | 5 -----
 2 files changed, 10 deletions(-)

(limited to '2.3-1/src/c/elementaryFunctions')

diff --git a/2.3-1/src/c/elementaryFunctions/includes/linspace.h b/2.3-1/src/c/elementaryFunctions/includes/linspace.h
index 00b1471a..62d45015 100644
--- a/2.3-1/src/c/elementaryFunctions/includes/linspace.h
+++ b/2.3-1/src/c/elementaryFunctions/includes/linspace.h
@@ -21,16 +21,11 @@ extern "C" {
 
 EXTERN_ELEMFUNCT void  dlinspaces(double low_limit,double up_limit,double range_num, double* out);
 
-<<<<<<< HEAD
 EXTERN_ELEMFUNCT void  slinspaces(float low_limit,float up_limit,float range_num, float* out);
 
 EXTERN_ELEMFUNCT void  dlinspacea(double *low_limit,int row,double *up_limit,double range_num, double* out);
 
 EXTERN_ELEMFUNCT void  slinspacea(float *low_limit,int row,float *up_limit,float range_num, float* out);
-=======
-EXTERN_ELEMFUNCT void  dlinspacea(double *low_limit,int row,double *up_limit,double range_num, double* out);
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 
 
diff --git a/2.3-1/src/c/elementaryFunctions/interfaces/int_linspace.h b/2.3-1/src/c/elementaryFunctions/interfaces/int_linspace.h
index febe516e..15ea2696 100644
--- a/2.3-1/src/c/elementaryFunctions/interfaces/int_linspace.h
+++ b/2.3-1/src/c/elementaryFunctions/interfaces/int_linspace.h
@@ -15,15 +15,10 @@
 
 #define d0d0d0linspaced2(in1,in2,in3,out) dlinspaces(in1,in2,in3,out)
 
-<<<<<<< HEAD
 #define s0s0s0linspaces2(in1,in2,in3,out) slinspaces(in1,in2,in3,out)
 
 #define d2d2d0linspaced2(in1,size1,in2,size2,in3,out) dlinspacea(in1,size1[0],in2,in3,out)
 
 #define s2s2s0linspaces2(in1,size1,in2,size2,in3,out) slinspacea(in1,size1[0],in2,in3,out)
 
-=======
-#define d2d2d0linspaced2(in1,size1,in2,size2,in3,out) dlinspacea(in1,size1[0],in2,in3,out)
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 #endif 
-- 
cgit