Merge to resolve conflicts in vendored packages

2019-05-30 14:33:14 -04:00
parent e13c535019 a4dbe7b102
commit 7e0637f6a9
173 changed files with 12742 additions and 1252 deletions
--- a/vendor/github.com/pkg/errors/errors_test.go
+++ b/vendor/github.com/pkg/errors/errors_test.go
@@ -196,6 +196,7 @@ func TestWithMessage(t *testing.T) {
 			t.Errorf("WithMessage(%v, %q): got: %q, want %q", tt.err, tt.message, got, tt.want)
 		}
 	}
+
 }

 func TestWithMessagefNil(t *testing.T) {