lgcosta/go-ntlm
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix accidentally committed merge conflict

Browse Source
This commit is contained in:
Lars Schneider authored and GitHub committed 2018-05-31 21:55:10 +02:00
1 parent 2a7c173f9e
commit fb351f8b8a
1 file changed
-4
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
-4
View File
@@ -1,5 +1 @@
<<<<<<< HEAD
pkg/
=======
pkg pkg
>>>>>>> adding License information and go format