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

edit in master
---

diff --git a/c/c1 b/c/c1
index bbdb3ea..18e11f4 100644
--- a/c/c1
+++ b/c/c1
@@ -1 +1 @@
-an edit in the trymerge branch
\ No newline at end of file
+edit in master
\ No newline at end of file