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

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

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