Fix commited conflict (#24)

Myafq · web-flow · commit 70ac875a091a · 2020-12-28T20:08:10.000+03:00
diff --git a/kmeans-mnist-pipeline/main.tf b/kmeans-mnist-pipeline/main.tf
@@ -208,10 +208,6 @@ resource null_resource dataset {
   }
 }
 
-<<<<<<< HEAD
-=======
-
->>>>>>> origin/kfp-example
 locals {
   images = {
     "us-west-1"      = "632365934929.dkr.ecr.us-west-1.amazonaws.com"

Original file line number	Diff line number	Diff line change
`@@ -208,10 +208,6 @@ resource null_resource dataset {`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`
`211`		`-<<<<<<< HEAD`
`212`		`-=======`
`213`		`-`
`214`		`->>>>>>> origin/kfp-example`
`215`	`211`	`locals {`
`216`	`212`	`images = {`
`217`	`213`	`"us-west-1" = "632365934929.dkr.ecr.us-west-1.amazonaws.com"`