From 03226cea3eb2fee6ec897220a14f66080908b080 Mon Sep 17 00:00:00 2001
From: Dylan Schiemann <dylan@dojotoolkit.org>
Date: Tue, 14 Sep 2021 08:36:06 +0100
Subject: [PATCH] fix release.yml (#4519)

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

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 04f1bbc05..85716a0b0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -41,11 +41,7 @@ jobs:
         uses: changesets/action@master
         with:
           # defined in package.json#scripts
-<<<<<<< HEAD
-          version: changesetversion
-=======
           version: yarn changesetversion
->>>>>>> 06434500... more work to fix automated changeset workflow
           publish: yarn changeset publish
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}