From cb0071c1398fa41d283aa23d44080a0f88f9dbb4 Mon Sep 17 00:00:00 2001
From: Paul Schultz <pschultz@pobox.com>
Date: Tue, 15 Oct 2024 16:44:24 -0500
Subject: [PATCH] chore(ci): fix git merge issue

Signed-off-by: Paul Schultz <pschultz@pobox.com>
---
 .github/workflows/release.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 00eaf76e7d..3fdc96945e 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -42,14 +42,11 @@ jobs:
           node-version-file: '.nvmrc'
           registry-url: 'https://registry.npmjs.org'
 
-<<<<<<< HEAD:.github/workflows/push.yaml
-=======
       - name: Install dependencies
         shell: bash
         run: |
           yarn install --frozen-lockfile
 
->>>>>>> a39d9f069 (chore(release): switch from msr to changesets (#2362)):.github/workflows/release.yaml
       - name: Build all packages
         uses: ./.github/actions/build