Merge pull request #13 from larsxschneider/patch-1

Fix accidentally committed merge conflict
2018-05-31 16:24:23 -04:00
parent 2a7c173f9e fb351f8b8a
commit ff14e82ec6
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