From d137f38347ed8e7925c4b0d91b62ec05b68f5046 Mon Sep 17 00:00:00 2001
From: "tembo[bot]" <208362400+tembo-io[bot]@users.noreply.github.com>
Date: Sat, 1 Aug 2026 01:32:37 +0000
Subject: [PATCH] fix(ci): resolve merge conflict markers in publish workflow

---
 .github/workflows/publish.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 6ddb579..bf6db09 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -15,20 +15,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-<<<<<<< HEAD
         uses: actions/checkout@v6
-=======
-        uses: actions/checkout@v5
->>>>>>> a10e20c (chore: update publish workflows to use pnpm@10.33.0 with GitHub Packages and Node 24.14.1)
 
       - name: set up node and pnpm
         run: |
           corepack enable
-<<<<<<< HEAD
-=======
           pnpm config set '//registry.npmjs.org/:_authToken' "${{ secrets.NPM_TOKEN }}"
           pnpm config set '//npm.pkg.github.com/:_authToken' "${{ secrets.GITHUB_TOKEN }}"
->>>>>>> a10e20c (chore: update publish workflows to use pnpm@10.33.0 with GitHub Packages and Node 24.14.1)
           pnpm i
 
       - name: publish