From d49a54e185c49bc4ff446382934f0f006bc8f404 Mon Sep 17 00:00:00 2001
From: kondeichmann <k.deichmann@mac.com>
Date: Fri, 3 Nov 2017 13:14:36 +0100
Subject: [PATCH] remove conflict fragment from .gitignore

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index cf689239..86849c6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,4 +41,3 @@ DerivedData
 DerivedData.noindex
 *.xcuserstate
 *.swp
->>>>>>> master
-- 
GitLab