From c8bbf1e99ed14835bfaf2e1507cea27be5e6dcff Mon Sep 17 00:00:00 2001
From: Kerautret <bertrand.kerautret@univ-lyon2.fr>
Date: Sat, 22 Dec 2018 09:57:49 +0100
Subject: [PATCH] re on merge

---
 Code/Seg/IPOLdemo/mainIPOL.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Code/Seg/IPOLdemo/mainIPOL.cpp b/Code/Seg/IPOLdemo/mainIPOL.cpp
index 05639cf..5413561 100755
--- a/Code/Seg/IPOLdemo/mainIPOL.cpp
+++ b/Code/Seg/IPOLdemo/mainIPOL.cpp
@@ -93,14 +93,9 @@ int main (int argc, char *argv[])
       }
     }
     fin.close();
-    cout << "siez i:"<< pts.size() << endl;
   }
   fout << "# Line detection generated from " << argv[0] << "with format : X1 Y1 X2 Y2 on each line" << std::endl;
-<<<<<<< HEAD
 
-=======
-  
->>>>>>> 98e75cffc2ac74f66288076537880443741a9cc8
   // Blurred segment detection
   vector<BlurredSegment *> bss;
   BSDetector detector;
-- 
GitLab