From ecf5a4f048740bfafc7056b66995cd513bdf3f73 Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Mon, 8 Feb 2021 13:54:16 -0800
Subject: [PATCH] fix(release): Fixes error in syntax (#494)

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

diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index 99c07d0d8..3a82eba2b 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -34,12 +34,8 @@ jobs:
         git config --global user.name "Fake Tag Action"
         git config --global user.email "hi@modernuo.com"
         git checkout ${{ steps.last_release.outputs.release }}
-<<<<<<< Updated upstream
         git tag -fa v0.1.0 -m "Fake release"
-=======
-        git tag -fa v0.1.0
         git push --force origin tag v0.1.0
->>>>>>> Stashed changes
         git checkout -
     - name: Conventional Changelog
       id: changelog