From 7b6af163ddb19be2f4372b6206119a5342bdbcab Mon Sep 17 00:00:00 2001
From: Leo Nicolle <leo@linkurio.us>
Date: Thu, 15 Feb 2024 21:47:55 +0100
Subject: [PATCH] merge conflicts

---
 .github/workflows/deploy.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 25bea9d..efc7bcf 100644
--- 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