Fix accidentally committed merge conflict

2018-05-31 21:55:10 +02:00
parent 2a7c173f9e
commit fb351f8b8a
1 changed files with 0 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-<<<<<<< HEAD
-pkg/
-=======
 pkg
->>>>>>> adding License information and go format