From f67c747f6fea986278e42da2383610e7f31a821b Mon Sep 17 00:00:00 2001
From: Steele <gsteele@tudelft.net@tud12721.fritz.box>
Date: Wed, 22 May 2013 22:30:49 +0200
Subject: [PATCH] edit trymerge

---
 c/c1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/c/c1 b/c/c1
index 4a35dc5..bbdb3ea 100644
--- a/c/c1
+++ b/c/c1
@@ -1 +1 @@
-this is a new test in code 2
\ No newline at end of file
+an edit in the trymerge branch
\ No newline at end of file
-- 
2.25.1