summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSanto Cariotti <sancn@live.com>2017-04-25 11:27:45 +0200
committerSanto Cariotti <sancn@live.com>2017-04-25 11:27:45 +0200
commitdd998a6f9c336944bb3738376cbf43d0c37a7dcb (patch)
treef632766adbc98e2fbf5b36da209e3f3a475f0bfa
parentf8b0d776251ca0da46782399ed9a7587b655bbee (diff)
parentcce73ad195f9448ae56771dd91e097067d198143 (diff)
Merge branch 'devs'
-rw-r--r--lswf.cpp4
-rw-r--r--test.py1
2 files changed, 5 insertions, 0 deletions
diff --git a/lswf.cpp b/lswf.cpp
index 5e3a5a2..218a9c8 100644
--- a/lswf.cpp
+++ b/lswf.cpp
@@ -44,7 +44,11 @@ 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--) {
diff --git a/test.py b/test.py
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/test.py
@@ -0,0 +1 @@
+