From 23d53288e25520d07be06cedb5f2c3933e440096 Mon Sep 17 00:00:00 2001
From: themelm <themelm@pm.me>
Date: Sat, 29 Mar 2025 15:10:10 -0600
Subject: [PATCH] workflowfix2

---
 .forgejo/Workflows/deploy.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.forgejo/Workflows/deploy.yml b/.forgejo/Workflows/deploy.yml
index 8d65527..35a5fc3 100644
--- a/.forgejo/Workflows/deploy.yml
+++ b/.forgejo/Workflows/deploy.yml
@@ -17,9 +17,5 @@ jobs:
           key: ${{ secrets.SSH_PRIVATE_KEY }}
           script: |
             ls
-<<<<<<< HEAD
-            cd homeserver
-=======
             cd Homepage
->>>>>>> c3ec9d31ec63e14c87b6b980b9864ff21dc3690b
             ${{ secrets.SCRIPT }}