Update deployment.yaml

flo-mair · web-flow · commit 1dae92f31c8b · 2020-09-14T14:43:25.000+02:00
diff --git a/cloudformation/deployment.yaml b/cloudformation/deployment.yaml
@@ -167,21 +167,17 @@ Resources:
 
   ProducerRepository01:
     Type: AWS::ECR::Repository
-<<<<<<< HEAD
     Properties:
       RepositoryName: kinesis-data-processor/producer
 
   ConsumerRepository01:
     Type: AWS::ECR::Repository
     Properties:
-=======
-    Properties:
       RepositoryName: kinesis-data-processor/producer
 
   ConsumerRepository01:
     Type: AWS::ECR::Repository
     Properties:
->>>>>>> e8a5851cfaaa5690d98d9156d4960b2c233bcb63
       RepositoryName: kinesis-data-processor/consumer
 
   KinesisAutoscalerRepository01:
