chore: fix symantic release config

(cherry picked from commit d1f28b6) # Conflicts: # .releaserc
earthians · Dec 24, 2024 · 9f941ba · 9f941ba
1 parent 993693b
commit 9f941ba
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.releaserc b/.releaserc
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
 	"branches": ["version-15"],
+=======
+	"branches": ["version-14", "version-15"],
+>>>>>>> d1f28b6 (chore: fix symantic release config)
 	"plugins": [
 		"@semantic-release/commit-analyzer", {
 			"preset": "angular",