Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit e7d1ee8

Browse files
committed
Fix botched gocovmerge vendoring
Signed-off-by: Joffrey F <[email protected]>
1 parent d4ddc16 commit e7d1ee8

File tree

3 files changed

+47
-31
lines changed

3 files changed

+47
-31
lines changed

Gopkg.lock

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
required = ["github.com/wadey/gocovmerge"]
2424

25-
2625
[[constraint]]
2726
name = "github.com/spf13/cobra"
2827
version = "0.0.2"
@@ -45,10 +44,6 @@ required = ["github.com/wadey/gocovmerge"]
4544
name = "github.com/gotestyourself/gotestyourself"
4645
branch = "master"
4746

48-
[[constraint]]
49-
name = "github.com/wadey/gocovmerge"
50-
branch = "master"
51-
5247
[[constraint]]
5348
name = "github.com/sirupsen/logrus"
5449
version = "v1.0.5"
@@ -81,6 +76,10 @@ required = ["github.com/wadey/gocovmerge"]
8176
name = "google.golang.org/grpc"
8277
revision = "v1.3.0"
8378

79+
[[constraint]]
80+
name = "github.com/wadey/gocovmerge"
81+
branch = "master"
82+
8483
[prune]
8584
non-go = true
8685
unused-packages = true

vendor/github.com/docker/yatee/yatee/yatee.go

Lines changed: 41 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)