Merge remote-tracking branch 'origin/master'

2 files changed, 6 insertions, 1 deletions

diff --git a/hello.rb b/hello.rb
new file mode 100644
index 0000000..f75e486
--- /dev/null
+++ b/hello.rb
@@ -0,0 +1 @@
+puts "hello, world"
diff --git a/lswf.cpp b/lswf.cpp
index 31f7745..218a9c8 100644
--- a/lswf.cpp
+++ b/lswf.cpp
@@ -44,7 +44,11 @@ int main()
 	}
 	int* seq = new int[lastc];
 	
-	//for(i = 0; i < lastc; i++) cout << caracts[i] << ' '; cout << endl;
+<<<<<<< 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--) {