From 0b17897d6abab4c40a6b95d26edc643a43551ffd Mon Sep 17 00:00:00 2001
From: Christian Gawlik <cgawlik@fh-bielefeld.de>
Date: Wed, 16 Apr 2014 20:47:54 +0200
Subject: [PATCH] is si

---
 konflikt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 konflikt

diff --git a/konflikt b/konflikt
deleted file mode 100644
index 51bcfe9..0000000
--- a/konflikt
+++ /dev/null
@@ -1 +0,0 @@
-hier kommt gleich ein Fehler