fixes testcase function name

divyansh42 · May 15, 2019 · 4ae2036 · 4ae2036
1 parent 7f338bd
commit 4ae2036
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/pkg/cmd/pipelinerun/list_test.go b/pkg/cmd/pipelinerun/list_test.go
@@ -150,9 +150,15 @@ func TestListPipelineRuns(t *testing.T) {
 	}
 }
 
+<<<<<<< HEAD
 func TestListPipeline_empty(t *testing.T) {
 	cs, _ := pipelinetest.SeedTestData(pipelinetest.Data{})
 	p := &tu.Params{Client: cs.Pipeline}
+=======
+func TestListPipelineRuns_empty(t *testing.T) {
+	cs, _ := test.SeedTestData(test.Data{})
+	p := &tu.TestParams{Client: cs.Pipeline}
+>>>>>>> fixes testcase function name
 
 	pipeline := Command(p)
 	output, err := tu.ExecuteCommand(pipeline, "list", "-n", "ns")