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

Merge pull request #13 from larsxschneider/patch-1

Browse Source 
Fix accidentally committed merge conflict
This commit is contained in:
Charlie Monzillo authored and GitHub committed 2018-05-31 16:24:23 -04:00
2 parents 2a7c173f9e fb351f8b8a
commit ff14e82ec6
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
>>>>>>> adding License information and go format