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

fix merge
---

77a2a9b0d2a972d33513dd6be694c6655e880330
diff --cc c/c1
index 18e11f4,105c963..6fa31de
--- a/c/c1
+++ b/c/c1
@@@ -1,1 -1,1 +1,1 @@@
- edit in master
 -edit in trymerge
++edit in code1