From 031367fb2c87aab94da75cdd896597865b8676e3 Mon Sep 17 00:00:00 2001
From: Audrey Jensen <ajensen@cramalot.com>
Date: Wed, 14 Aug 2024 10:06:24 -0500
Subject: [PATCH] resolve merge issue

---
 .gitea/workflows/production-deploy.yaml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/.gitea/workflows/production-deploy.yaml b/.gitea/workflows/production-deploy.yaml
index f39e6e5..933ac06 100644
--- a/.gitea/workflows/production-deploy.yaml
+++ b/.gitea/workflows/production-deploy.yaml
@@ -24,15 +24,4 @@ jobs:
 
       - name: Update Composer Packages
         working-directory: ${{ var.PROD_DEPLOY_DIR }}
-<<<<<<< HEAD
-        run: composer update
-
-      - name: Refresh Site Cache
-        working-directory: ${{ var.PROD_DEPLOY_DIR }}
-        run: |
-          php bin/console cache:clear
-          php bin/console cache:pool:prune
-          php bin/console cache:warmup
-=======
         run: composer update --no-interaction --working-dir=${{ var.PROD_DEPLOY_DIR }}
->>>>>>> d172aec (remove redundant cache refresh)