Merge branch 'master' into for-vgo

This commit is contained in:
Charlie Monzillo 2018-06-04 16:10:31 -04:00 committed by GitHub
commit 4ed67641c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 5 deletions

4
.gitignore vendored
View File

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

View File

@ -62,7 +62,7 @@ func TestNtlmV1ExtendedSessionSecurity(t *testing.T) {
context.SetServerChallenge(c.ServerChallenge)
err = context.ProcessAuthenticateMessage(msg)
if err == nil {
t.Errorf("This message should have failed to authenticate, but it passed")
t.Error("This message should have failed to authenticate, but it passed")
}
}