merge conflicts

Leo-Nicolle · Feb 15, 2024 · 7b6af16 · 7b6af16
1 parent 9de7c6d
commit 7b6af16
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -40,15 +40,7 @@ jobs:
           echo "SERVER=${{ env.DIR }}/server.js" >> $GITHUB_ENV
           echo "ASSETS=${{ env.DIR }}/public/assets" >> $GITHUB_ENV
           echo "INDEX_HTML=${{ env.DIR }}/public/index.html" >> $GITHUB_ENV
-<<<<<<< HEAD
-<<<<<<< HEAD
-          if [[ ${{env.DEPLOY_ASSETS}} ='false' && ${{env.DEPLOY_SERVER}} ='false' && ${{env.DEPLOY_CLIENT}} ='false' ]]; then
-=======
           if [[ $DEPLOY_ASSETS == 'false' && $DEPLOY_SERVER == 'false' && $DEPLOY_CLIENT == 'false' ]]; then
->>>>>>> @{-1}
-=======
-          if [[ $DEPLOY_ASSETS == 'false' && $DEPLOY_SERVER == 'false' && $DEPLOY_CLIENT == 'false' ]]; then
->>>>>>> a4921900da1ee53b45ab80cbc2c5e314377eacaf
             exit 1;
           fi