From fb351f8b8a893c2ca837fc803ed2b96bc052a7ce Mon Sep 17 00:00:00 2001
From: Lars Schneider <larsxschneider@gmail.com>
Date: Thu, 31 May 2018 21:55:10 +0200
Subject: [PATCH] Fix accidentally committed merge conflict

---
 .gitignore | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index a762830..5fff1d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-<<<<<<< HEAD
-pkg/
-=======
 pkg
->>>>>>> adding License information and go format