From d501674526a96df4ccf41ab02e6936205ce048a7 Mon Sep 17 00:00:00 2001
From: Florian Bogner <f.bogner@pcsg.de>
Date: Fri, 6 Oct 2017 11:27:41 +0200
Subject: [PATCH] Random number test

---
 test.txt | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/test.txt b/test.txt
index 9e11af6..5a34644 100644
--- a/test.txt
+++ b/test.txt
@@ -1,6 +1 @@
-5412
-<<<<<<< HEAD
-1
-=======
-123
->>>>>>> 1d7745d83710d9e1176c1ca38b653a6eb5e5e9b5
+37851
\ No newline at end of file
-- 
GitLab