remove conflict with master

stashed · Feb 27, 2019 · 47694c1 · 47694c1
1 parent 910b9a8
commit 47694c1
Show file tree

Hide file tree

Showing 52 changed files with 3,547 additions and 7,532 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/vendor/github.com/go-openapi/jsonpointer/pointer.go b/vendor/github.com/go-openapi/jsonpointer/pointer.go
diff --git a/vendor/github.com/go-openapi/swag/convert.go b/vendor/github.com/go-openapi/swag/convert.go