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 2018-05-31 16:24:23 -04:00 committed by GitHub
commit ff14e82ec6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -1,5 +1 @@
<<<<<<< HEAD
pkg/
=======
pkg pkg
>>>>>>> adding License information and go format