From: Steele <gsteele@tudelft.net@tud12721.fritz.box>
Date: Wed, 22 May 2013 20:26:24 +0000 (+0200)
Subject: Replaced code1 files with code2 files in the trymerge branch
X-Git-Url: https://nsweb.tn.tudelft.nl/gitweb/?a=commitdiff_plain;h=ede055536cc1bd3ca0fb9d28a842bd2f9b0e0ca2;p=test.git

Replaced code1 files with code2 files in the trymerge branch
---

diff --git a/c/c1 b/c/c1
index a8a9406..4a35dc5 100644
--- 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
index 0000000..e69de29