[NDR - 108] removing merge confict annotations

Author: SWhyteAnswer

.github/workflows/terraform-deploy-feature-to-sandbox.yml

@@ -29,49 +29,11 @@ jobs:
     environment: ${{ github.event.inputs.environment }}
 
     steps:
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
       # Checkout the repository to the GitHub Actions runner
       - name: Checkout Base
         uses: actions/checkout@v5
         with:
           ref: main
-=======
-=======
->>>>>>> ae84789 ([NDR-108] temp removing base)
-=======
->>>>>>> 043bc42 ([NDR-108] temp standing down base init)
-      # - name: Checkout Base
-      #   uses: actions/checkout@v4
-      #   with:
-      #     ref: main
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> fbff22f ([NDR-108] readding dynamo-db)
-=======
-=======
->>>>>>> f5406c0 ([NDR-108] re-adding db and making action right)
-=======
->>>>>>> 1f51c26 ([NDR-108] set for pr)
-      - name: Checkout Base
-        uses: actions/checkout@v4
-        with:
-          ref: main
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> 0716aef ([NDR-108] reverting the workflow)
-=======
->>>>>>> ae84789 ([NDR-108] temp removing base)
-=======
->>>>>>> f5406c0 ([NDR-108] re-adding db and making action right)
-=======
->>>>>>> 043bc42 ([NDR-108] temp standing down base init)
-=======
->>>>>>> 1f51c26 ([NDR-108] set for pr)
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -96,20 +58,24 @@ jobs:
         run: terraform init -backend-config=backend.conf
         working-directory: ./infrastructure
         shell: bash
+
       - name: Terraform Set Workspace Base
         id: base_workspace
         run: terraform workspace select -or-create ${{ github.event.inputs.sandboxWorkspace}}
         working-directory: ./infrastructure
         shell: bash
+
       - name: Terraform Plan Base
         id: base_plan
         run: |
           terraform plan -input=false -no-color -var-file="${{vars.TF_VARS_FILE}}" -out tf-base.plan
         working-directory: ./infrastructure
         shell: bash
+
       - name: Terraform Apply Base
         run: terraform apply -auto-approve -input=false tf-base.plan
         working-directory: ./infrastructure
+
       - name: Checkout Branch
         uses: actions/checkout@v5
         with: