From d06e78bb5e4a81255a48a45c2e5d3f326b1c687b Mon Sep 17 00:00:00 2001
From: Arlind <arlind@sulejmani.xyz>
Date: Sun, 28 Sep 2025 13:41:38 +0200
Subject: [PATCH] Update .gitea/workflows/ci.yml

---
 .gitea/workflows/ci.yml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index caec9206..c93e370d 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -293,11 +293,7 @@ jobs:
             echo "    → Generating video..."
             if ! xvfb-run -a "$DANSER_DIR/danser-cli" \
               -replay "$GAMEPLAY_REPLAY_PATH" -record -skip -start=300 -end=307 -noupdatecheck \
-<<<<<<< HEAD
-              -out="$SKIN_NAME" -skin="$SKIN_NAME" >"$LOGFILE" 2>&1; then
-=======
               -out="$SKIN_NAME" -skin="$SKIN_NAME" -settings="skinhub" >"$LOGFILE" 2>&1; then
->>>>>>> 5e56a7c9d3140e7db7a71d1dcc52094d54f4d8d1
               echo "    ✖ Video failed for $SKIN_NAME"; cat "$LOGFILE"; INDEX=$((INDEX+1)); continue
             fi
 
@@ -324,11 +320,7 @@ jobs:
 
             echo "    → Taking screenshot..."
             if ! xvfb-run -a "$DANSER_DIR/danser-cli" \
-<<<<<<< HEAD
-              -replay "$PANEL_REPLAY_PATH" -skip -noupdatecheck -ss 28 \
-=======
               -replay "$PANEL_REPLAY_PATH" -skip -settings="skinhub" -noupdatecheck -ss 28 \
->>>>>>> 5e56a7c9d3140e7db7a71d1dcc52094d54f4d8d1
               -out="$SKIN_NAME" -skin="$SKIN_NAME" >>"$LOGFILE" 2>&1; then
               echo "    ✖ Screenshot failed for $SKIN_NAME"; cat "$LOGFILE"; INDEX=$((INDEX+1)); continue
             fi
@@ -343,11 +335,7 @@ jobs:
 
             echo "    → Taking thumbnail screenshot..."
             if ! xvfb-run -a "$DANSER_DIR/danser-cli" \
-<<<<<<< HEAD
-              -replay "$THUMBNAIL_REPLAY_PATH" -skip -noupdatecheck -ss 1.3 \
-=======
               -replay "$THUMBNAIL_REPLAY_PATH" -skip -settings="skinhub" -noupdatecheck -ss 1.3 \
->>>>>>> 5e56a7c9d3140e7db7a71d1dcc52094d54f4d8d1
               -out="${SKIN_NAME}_thumb" -skin="$SKIN_NAME" >>"$LOGFILE" 2>&1; then
               echo "    ✖ Thumbnail screenshot failed for $SKIN_NAME"; cat "$LOGFILE"; INDEX=$((INDEX+1)); continue
             fi
@@ -841,11 +829,7 @@ jobs:
 
             mkdir -p "$(dirname "$md_file_path")"
 
-<<<<<<< HEAD
-            video_url="$REGISTRY_URL/$USER_REPOSITORY/raw/tag/$new_tag/media/gameplay/${base_path}.mp4"
-=======
             video_url="$REGISTRY_URL/$USER_REPOSITORY/media/tag/$new_tag/media/gameplay/${base_path}.mp4"
->>>>>>> 5e56a7c9d3140e7db7a71d1dcc52094d54f4d8d1
 
             author=""
             if [ -f "$ini_file" ]; then