From 7897e538076a8824470ee1c709f535f23fed9355 Mon Sep 17 00:00:00 2001
From: Aleksey_Skakodub <skakodubaleksej@gmail.com>
Date: Mon, 26 May 2025 16:40:36 -0400
Subject: [PATCH] =?UTF-8?q?=D1=82=D1=80=D0=B0=D0=BB=D0=B0=D0=BB=D0=B5?=
 =?UTF-8?q?=D1=80=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index e53064d..994daee 100755
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -26,10 +26,6 @@ jobs:
             cd ${{ secrets.PROJECT_PATH }} &&
             git pull origin main &&
             docker-compose down --remove-orphans &&
-<<<<<<< HEAD
             sleep 3 &&
-=======
-	        sleep 3 &&
->>>>>>> ebdc08a921273e8a46bcf5fcf9a727dc832aa7d3
             docker-compose up -d --build
           "