Merge branch 'cpp'

Conflicts: hello-world
2015-10-08 22:15:01 +02:00 · 2015-10-08 22:15:01 +02:00 · abc28b191c
parent 418f6e33d4 ad6da15d15
commit abc28b191c
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -1,3 +1,3 @@
 std::cout << "hello world";

-test
+testplopiplop