Merge branch 'cpp'

Conflicts: hello-world
9 years ago · abc28b191c
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -1,3 +1,3 @@
 std::cout << "hello world";

-test
+testplopiplop