resolve merge conflicts

This commit is contained in:
Imanol Maiztegui
2026-04-13 13:42:50 +02:00
34 changed files with 63024 additions and 35975 deletions
+1 -1
View File
@@ -90,7 +90,7 @@ function bumpVersion(current: string, type: string) {
// kilocode_change end
const VERSION = await (async () => {
if (env.KILO_VERSION) return env.KILO_VERSION // kilocode_change
if (env.KILO_VERSION) return env.KILO_VERSION
if (IS_PREVIEW) {
// kilocode_change start - rc releases use plain semver required by VS Code Marketplace
if (env.KILO_BUMP && env.KILO_PRE_RELEASE === "true") {