feast-dev
diff --git a/‎cli/feast/cmd/jobs.go‎
Lines changed: 0 additions & 3 deletions b/‎cli/feast/cmd/jobs.go‎
Lines changed: 0 additions & 3 deletions
@@ -29,10 +29,7 @@ import (
 
 var (
 	waitJobComplete = false
-<<<<<<< HEAD
-=======
 	jobName         = "feastimport"
->>>>>>> 79abea3dde21c2856d23cba8866a1e06b6166939
 )
 
 // jobsCmd represents the jobs command
Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,7 @@ import (`
`29`	`29`
`30`	`30`	`var (`
`31`	`31`	`waitJobComplete = false`
`32`		`-<<<<<<< HEAD`
`33`		`-=======`
`34`	`32`	`jobName = "feastimport"`
`35`		`->>>>>>> 79abea3dde21c2856d23cba8866a1e06b6166939`
`36`	`33`	`)`
`37`	`34`
`38`	`35`	`// jobsCmd represents the jobs command`