Revert "SCi2cDeps updated, Windows compatibility resolved"

1 files changed, 0 insertions, 19 deletions

diff --git a/2.3-1/macros/ImageProcessing/highgui/CV_SaveImage.sci b/2.3-1/macros/ImageProcessing/highgui/CV_SaveImage.sci
index 999c634c..6c5b0bf9 100644
--- a/2.3-1/macros/ImageProcessing/highgui/CV_SaveImage.sci
+++ b/2.3-1/macros/ImageProcessing/highgui/CV_SaveImage.sci
@@ -15,7 +15,6 @@ function status = CV_SaveImage(filename,img)
 //     CV_SaveImage(filename,img)
 //
 // Parameters
-<<<<<<< HEAD
 //	filename: name of file image to be saved as
 //	img: image to be saved
 //
@@ -29,31 +28,13 @@ function status = CV_SaveImage(filename,img)
 // Examples
 //	img = CV_LoadImage('~/test.jpg',0)
 //	CV_SaveImage('test1.png',img)
-=======
-//     filename: name of file image to be saved as
-//	   img: image to be saved
-//
-// Description
-//		This function can be used for saving image. File format is detected
-//		from file extension 
-// Examples
-//		img = CV_LoadImage('~/test.jpg',0)
-//		CV_SaveImage('test1.png',img)
-//
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 // See also
 //     CV_LoadImage CV_CreateImage
 //
 // Authors
 //     Siddhesh Wani
 //
-<<<<<<< HEAD
 
 status = 0;
-=======
-status = 0;
-// This is curretly dummy function. It provides no functionality but is required 
-// for providing support for generating C code for OpenCV
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 endfunction