fix: conflict fix in on_release.yml

earthians · Dec 24, 2024 · fc913f7 · fc913f7
1 parent 357d1b7
commit fc913f7
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/.github/workflows/on_release.yml b/.github/workflows/on_release.yml
@@ -3,10 +3,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-<<<<<<< HEAD
-=======
       - version-14
->>>>>>> 7108dfb (chore: update semantic-release workflow config)
       - version-15
 jobs:
   release:
@@ -33,4 +30,4 @@ jobs:
           GIT_AUTHOR_EMAIL: "devs@earthianslive.com"
           GIT_COMMITTER_NAME: "earthians PR Bot"
           GIT_COMMITTER_EMAIL: "devs@earthianslive.com"
-        run: npx semantic-release
+        run: npx semantic-release