diff options
-rw-r--r-- | lswf.cpp | 4 | ||||
-rw-r--r-- | test2.py | 1 |
2 files changed, 5 insertions, 0 deletions
@@ -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/test2.py b/test2.py new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/test2.py @@ -0,0 +1 @@ + |