Replaced code1 files with code2 files in the trymerge branch

diff --git a/c/c1 b/c/c1
index a8a940627d132695a9769df883f85992f0ff4a43..4a35dc5c189e4b3b0b9fa46f51a6c4080524963b 100644 (file)
--- a/c/c1
+++ b/c/c1
@@ -1 +1 @@
-this is a test
\ No newline at end of file
+this is a new test in code 2
\ No newline at end of file

diff --git a/d/d1 b/d/d1
new file mode 100644 (file)
index 0000000..e69de29