From 415e5700f2c42c750647eeea06395f98a3e09f2a Mon Sep 17 00:00:00 2001
From: Alireza Rezvani <reza.rezvani73@googlemail.com>
Date: Tue, 24 Feb 2026 17:21:30 +0100
Subject: [PATCH] fix(ci): remove stray merge conflict marker in
 sync-codex-skills.yml (#221)

Co-authored-by: Leo <leo@leo-agent-server>
---
 .github/workflows/sync-codex-skills.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/sync-codex-skills.yml b/.github/workflows/sync-codex-skills.yml
index e7fdb5c..956537b 100644
--- a/.github/workflows/sync-codex-skills.yml
+++ b/.github/workflows/sync-codex-skills.yml
@@ -29,7 +29,6 @@ jobs:
         with:
           fetch-depth: 0
           token: ${{ secrets.PROJECTS_TOKEN }}
->>>>>>> b6f463f (fix(ci): pass PROJECTS_TOKEN to fix automated git push and dedup checkout step)
 
       - name: Set up Python
         uses: actions/setup-python@v5