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"

---
 src/c/elementaryFunctions/includes/linspace.h | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src/c/elementaryFunctions/includes')

diff --git a/src/c/elementaryFunctions/includes/linspace.h b/src/c/elementaryFunctions/includes/linspace.h
index 00b1471a..62d45015 100644
--- a/src/c/elementaryFunctions/includes/linspace.h
+++ b/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
 
 
 
-- 
cgit