Forgot to save one file

commitdev · Nov 12, 2019 · e3e0409 · e3e0409
1 parent bb21fe9
commit e3e0409
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/templates/commit0/commit0.tmpl b/templates/commit0/commit0.tmpl
@@ -13,14 +13,10 @@ infrastructure:
     region: us-east-1
     eks:
       clusterName: staging
-<<<<<<< HEAD
-      deploy: true
     cognito:
-      deploy: true
+      enabled: true
     s3_hosting:
-      deploy: true
-=======
->>>>>>> Various fixes to applying kube tf and added flags
+      enabled: true
 
 frontend:
   framework: {{.FrontendFramework}}