chore(ci): fix git merge issue

Signed-off-by: Paul Schultz <pschultz@pobox.com>
janus-idp · Oct 15, 2024 · cb0071c · cb0071c
1 parent 91ba24d
commit cb0071c
Showing 1 changed file with 0 additions and 3 deletions.
diff --git 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