Fix merge

Cardinal-Cryptography · Aug 13, 2024 · c8722d2 · c8722d2
1 parent 606072b
commit c8722d2
Showing 1 changed file with 0 additions and 30 deletions.
diff --git a/.github/workflows/_relayer-build-and-push.yml b/.github/workflows/_relayer-build-and-push.yml
@@ -34,37 +34,7 @@ jobs:
           if [[ \
             '${{ inputs.layer }}' != 'L1' && '${{ inputs.layer }}' != 'L2'
           ]]; then
-<<<<<<< HEAD
-            echo 'Invalid environment'
-            exit 1
-          fi
-
-          if [[ \
-            '${{ inputs.frontend-environment }}' != 'dev' && \
-            '${{ inputs.frontend-environment }}' != 'stage' && \
-            '${{ inputs.frontend-environment }}' != 'prod'
-          ]]; then
-            echo 'Invalid frontend environment'
-            exit 1
-          fi
-
-          # TODO: Remove when implemented
-          if [[ \
-            '${{ inputs.frontend-environment }}' != 'dev'
-          ]]; then
-            echo 'Only dev frontend environment is implemented at this moment'
-            exit 1
-          fi
-
-          # TODO: Remove when implemented
-          if [[ \
-            '${{ inputs.environment }}' == 'testnet' || \
-            '${{ inputs.environment }}' == 'mainnet' \
-          ]]; then
-            echo 'testnet and mainnet are not implemented yet'
-=======
             echo 'Invalid layer'
->>>>>>> origin/master
             exit 1
           fi