Bump github.com/Masterminds/semver

My pull request was merged, so switching back to upstream
vladmashtak · Apr 3, 2018 · 1b3c593 · 1b3c593
1 parent 103c775
commit 1b3c593
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -1,8 +1,6 @@
-# https://github.com/Masterminds/semver/pull/60
 [[constraint]]
   name = "github.com/Masterminds/semver"
-  source = "https://github.com/carolynvs/semver.git"
-  branch = "parse-constraints-with-dash-in-pre"
+  branch = "2.x"
 
 [[constraint]]
   name = "github.com/Masterminds/vcs"

diff --git a/vendor/github.com/Masterminds/semver/constraints.go b/vendor/github.com/Masterminds/semver/constraints.go
diff --git a/vendor/github.com/Masterminds/semver/parse.go b/vendor/github.com/Masterminds/semver/parse.go