modified lsw

1 files changed, 0 insertions, 6 deletions

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];