From b8790414dcff1c5a6e2bc53b31aae5de3e83bc20 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Fri, 11 Aug 2017 13:44:47 -0500 Subject: [PATCH] Fix bad merge from #978 --- cmd/dep/glide_importer_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/dep/glide_importer_test.go b/cmd/dep/glide_importer_test.go index 2478184492..af9904b51c 100644 --- a/cmd/dep/glide_importer_test.go +++ b/cmd/dep/glide_importer_test.go @@ -397,7 +397,7 @@ func TestGlideConfig_Convert_ConsolidateRootPackages(t *testing.T) { }, } - manifest, lock, err := g.convert(testGlideProjectRoot) + manifest, lock, err := g.convert(testProjectRoot) h.Must(err) gotMLen := len(manifest.Constraints)