From cb80fca3a614931d895df03a34dc26af8ddac0e1 Mon Sep 17 00:00:00 2001
From: Alec Aivazis <alec@aivazis.com>
Date: Sat, 7 Oct 2023 23:05:27 -0700
Subject: [PATCH] fix merge conflicts in action file

---
 .github/workflows/canary.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml
index 37024036e..bc84c7cc6 100644
--- a/.github/workflows/canary.yml
+++ b/.github/workflows/canary.yml
@@ -57,10 +57,6 @@ jobs:
               run: |
                   pnpm changeset version --snapshot
                   pnpm run build
-<<<<<<< Updated upstream:.github/workflows/nightly.yml
-                  pnpm changeset publish --no-git-tag --snapshot --tag nightly
-=======
                   pnpm changeset publish --no-git-tag --snapshot --tag canary-${GITHUB_BASE_REF}
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
->>>>>>> Stashed changes:.github/workflows/canary.yml