From 2777aee31cb1bf6e90175d646c90945711049059 Mon Sep 17 00:00:00 2001
From: Santo Cariotti <sancn@live.com>
Date: Thu, 11 May 2017 18:07:13 +0200
Subject: modified lsw

---
 cpp/lswf.cpp | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'cpp/lswf.cpp')

diff --git a/cpp/lswf.cpp b/cpp/lswf.cpp
index 218a9c8..ea2551f 100644
--- a/cpp/lswf.cpp
+++ b/cpp/lswf.cpp
@@ -44,12 +44,6 @@ int main()
 	}
 	int* seq = new int[lastc];
 	
-<<<<<<< HEAD
-	for(i = 0; i < lastc; i++) cout << caracts[i] << ' '; cout << endl;
-=======
-	for(i = 0; i < lastc; i++) cout << caracts[i] << endl; cout << endl;
->>>>>>> devs
-	
 	seq[0] = 1;
 	for(i = lastc; i > 0; i--) {
 		potSomma = somma + caracts[i];
-- 
cgit v1.2.3-18-g5258