fix: correcting broken merge (#252)

zroubalik · web-flow · commit 8d1f5b833d86 · 2020-12-14T09:54:07.000-05:00
Signed-off-by: Zbynek Roubalik &lt;zroubali@redhat.com&gt;
diff --git a/cmd/list.go b/cmd/list.go
@@ -75,16 +75,12 @@ func runList(cmd *cobra.Command, args []string) (err error) {
 		return
 	}
 
-<<<<<<< HEAD
-	write(os.Stdout, listItems(items), config.Output)
-=======
 	if len(items) < 1 {
 		fmt.Printf("No functions found in %v namespace\n", lister.Namespace)
 		return
 	}
 
-	write(os.Stdout, listItems(items), config.Format)
->>>>>>> ca24764... fix: print "No functions found in [ns] namespace" for kn func list
+	write(os.Stdout, listItems(items), config.Output)
 
 	return
 }
diff --git a/go.sum b/go.sum
@@ -1146,8 +1146,6 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
-github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
-github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/assertions v1.0.0 h1:UVQPSSmc3qtTi+zPPkCXvZX9VvW/xT/NsRvKfwY81a8=
 github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=
diff --git a/pkged.go b/pkged.go

Original file line number	Diff line number	Diff line change
`@@ -75,16 +75,12 @@ func runList(cmd *cobra.Command, args []string) (err error) {`
`75`	`75`	`return`
`76`	`76`	`}`
`77`	`77`
`78`		`-<<<<<<< HEAD`
`79`		`- write(os.Stdout, listItems(items), config.Output)`
`80`		`-=======`
`81`	`78`	`if len(items) < 1 {`
`82`	`79`	`fmt.Printf("No functions found in %v namespace\n", lister.Namespace)`
`83`	`80`	`return`
`84`	`81`	`}`
`85`	`82`
`86`		`- write(os.Stdout, listItems(items), config.Format)`
`87`		`->>>>>>> ca24764... fix: print "No functions found in [ns] namespace" for kn func list`
	`83`	`+ write(os.Stdout, listItems(items), config.Output)`
`88`	`84`
`89`	`85`	`return`
`90`	`86`	`}`