stash

EconomistDigitalSolutions · Jan 28, 2019 · da0d54c · da0d54c
1 parent 093281a
commit da0d54c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/examples/hello-app/terraform.tfvars b/examples/hello-app/terraform.tfvars
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
 aws-profile       = "economist-ds-dev"
-=======
-aws-profile       = ""
->>>>>>> e09e0a1ce2c524db201abc769ee90d1d144315f4
 aws-region        = "eu-west-3"