From: Steele <gsteele@tudelft.net@tud12721.fritz.box>
Date: Wed, 22 May 2013 20:56:52 +0000 (+0200)
Subject: fix conflict
X-Git-Url: https://nsweb.tn.tudelft.nl/gitweb/?a=commitdiff_plain;h=03fa67e15f5f42a143d84a470e94fbc948681c39;p=test.git

fix conflict
---

03fa67e15f5f42a143d84a470e94fbc948681c39
diff --cc c/c1
index 6fa31de,90f0620..876f246
--- a/c/c1
+++ b/c/c1
@@@ -1,1 -1,1 +1,1 @@@
- edit in code1
 -edit it code_copy
++edit in code1