From ede055536cc1bd3ca0fb9d28a842bd2f9b0e0ca2 Mon Sep 17 00:00:00 2001 From: Steele Date: Wed, 22 May 2013 22:26:24 +0200 Subject: [PATCH] Replaced code1 files with code2 files in the trymerge branch --- c/c1 | 2 +- d/d1 | 0 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 d/d1 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 -- 2.25.1