diff options
author | Santo Cariotti <sancn@live.com> | 2017-04-25 11:27:45 +0200 |
---|---|---|
committer | Santo Cariotti <sancn@live.com> | 2017-04-25 11:27:45 +0200 |
commit | dd998a6f9c336944bb3738376cbf43d0c37a7dcb (patch) | |
tree | f632766adbc98e2fbf5b36da209e3f3a475f0bfa | |
parent | f8b0d776251ca0da46782399ed9a7587b655bbee (diff) | |
parent | cce73ad195f9448ae56771dd91e097067d198143 (diff) |
Merge branch 'devs'
-rw-r--r-- | lswf.cpp | 4 | ||||
-rw-r--r-- | test.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--) { @@ -0,0 +1 @@ + |