fix: connflict fix on .releaserc

earthians · Dec 24, 2024 · cf2e836 · cf2e836
1 parent 05af700
commit cf2e836
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/.releaserc b/.releaserc
@@ -1,9 +1,5 @@
 {
-<<<<<<< HEAD
-	"branches": ["version-15"],
-=======
-	"branches": ["version-14", "version-15"],
->>>>>>> d1f28b6 (chore: fix symantic release config)
+"branches": ["version-14", "version-15"],
 	"plugins": [
 		"@semantic-release/commit-analyzer", {
 			"preset": "angular",
@@ -25,4 +21,4 @@
 		],
 		"@semantic-release/github"
 	]
-}
+}