fixed conflicts

Author: root

google_function/.terrahub.yml

@@ -23,15 +23,9 @@ component:
           source: ./demo.zip
       google_cloudfunctions_function:
         google_function:
-<<<<<<< HEAD:google_function/.terrahub.yml
           depends_on:
             - google_storage_bucket_object.google_storage_object
           name: 'demofunction${local.project["code"]}'
-=======
-          name: 'demofunction${local.project["code"]}'
-          depends_on:
-            - google_storage_bucket_object.google_storage_object
->>>>>>> 954e40474032055d4b4f929cfdbe7991e50c8e39:google_function/.terrahub.yml
           region: us-central1
           runtime: nodejs8
           description: My demo function
@@ -41,24 +35,6 @@ component:
           trigger_http: true
           timeout: 60
           entry_point: helloGET
-<<<<<<< HEAD:google_function/.terrahub.yml
-=======
-      google_storage_bucket_object:
-        google_storage_object:
-          name: demo.zip
-          bucket: '${data.terraform_remote_state.storage.thub_id}'
-          source: ./demo.zip
-    terraform:
-      backend:
-        local:
-          path: /tmp/.terrahub/local_backend/google_function/terraform.tfstate
-    data:
-      terraform_remote_state:
-        storage:
-          backend: local
-          config:
-            path: /tmp/.terrahub/local_backend/google_storage/terraform.tfstate
->>>>>>> 954e40474032055d4b4f929cfdbe7991e50c8e39:google_function/.terrahub.yml
     output:
       id:
         value: '${google_cloudfunctions_function.google_function.id}'
@@ -88,20 +64,7 @@ build:
     build:
       commands:
         - 'echo "BUILD: Running build step"'
-<<<<<<< HEAD:google_function/.terrahub.yml
         - ./scripts/build.sh $COMPONENT_NAME $OBJECT_NAME $THUB_BUCKET_KEY/
-=======
-        - >-
-          if [ "$(head -n 1 "$THUB_FUNCTION_TXT")" != "$(stat -c %y
-          "${THUB_BUILD_PATH}/index.js")" ]; then zip -j ${THUB_FUNCTION_ZIP}
-          ${THUB_BUILD_PATH}/index.js; fi
-        - >-
-          if [ "$(head -n 1 "$THUB_FUNCTION_TXT")" != "$(stat -c %y
-          "${THUB_BUILD_PATH}/index.js")" ]; then terrahub configure -i
-          google_function -c
-          component.template.resource.google_storage_bucket_object.google_storage_object.name=$(date
-          +%s).zip; fi
->>>>>>> 954e40474032055d4b4f929cfdbe7991e50c8e39:google_function/.terrahub.yml
       finally:
         - 'echo "BUILD: build step successful"'
     post_build: