From ab0155abb7739fa27ef9f12fa538d82f1a5cea96 Mon Sep 17 00:00:00 2001
From: Soil King <157099073+soilking@users.noreply.github.com>
Date: Fri, 26 Jul 2024 10:38:11 -0700
Subject: [PATCH] fix subgraph deploy workflow

---
 .github/workflows/deploy.subgraph.yaml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/deploy.subgraph.yaml b/.github/workflows/deploy.subgraph.yaml
index 4f347853f2..6583a64381 100644
--- a/.github/workflows/deploy.subgraph.yaml
+++ b/.github/workflows/deploy.subgraph.yaml
@@ -22,13 +22,8 @@ jobs:
       - name: Validate environment input
         id: check_env
         run: |
-<<<<<<< HEAD
-          # Check if the environment is either 'prod' or 'dev' or 'testing'
-          if [[ "${{ github.event.inputs.environment }}" != "prod" && "${{ github.event.inputs.environment }}" != "dev" && "${{ github.event.inputs.environment }}" != "testing" ]]; then
-=======
           # Check if the environment is prod/dev/testing/prev
           if [[ "${{ github.event.inputs.environment }}" != "prod" && "${{ github.event.inputs.environment }}" != "dev" && "${{ github.event.inputs.environment }}" != "testing" && "${{ github.event.inputs.environment }}" != "prev" ]]; then
->>>>>>> master
             echo "Error: Environment must be one of 'prod', 'dev', 'testing'."
             exit 1
           fi