chore: merge main

jherr · jherr · commit 473bd3aa0f35 · 2025-04-12T08:21:00.000-07:00
diff --git a/cli/create-start-app/package.json b/cli/create-start-app/package.json
@@ -1,10 +1,6 @@
 {
   "name": "create-start-app",
-<<<<<<< HEAD
   "version": "0.10.0-alpha.15",
-=======
-  "version": "0.12.0",
->>>>>>> main
   "description": "Tanstack Start Builder",
   "bin": "./dist/index.js",
   "type": "module",
diff --git a/cli/create-tanstack/package.json b/cli/create-tanstack/package.json
@@ -1,10 +1,6 @@
 {
   "name": "create-tanstack",
-<<<<<<< HEAD
   "version": "0.10.0-alpha.15",
-=======
-  "version": "0.12.0",
->>>>>>> main
   "description": "Tanstack Application Builder",
   "bin": "./dist/index.js",
   "type": "module",
diff --git a/cli/create-tsrouter-app/package.json b/cli/create-tsrouter-app/package.json
@@ -1,10 +1,6 @@
 {
   "name": "create-tsrouter-app",
-<<<<<<< HEAD
   "version": "0.10.0-alpha.15",
-=======
-  "version": "0.12.0",
->>>>>>> main
   "description": "Tanstack Application Builder",
   "bin": "./dist/index.js",
   "type": "module",
diff --git a/packages/cta-engine/package.json b/packages/cta-engine/package.json
@@ -1,10 +1,6 @@
 {
   "name": "@tanstack/cta-engine",
-<<<<<<< HEAD
   "version": "0.10.0-alpha.15",
-=======
-  "version": "0.12.0",
->>>>>>> main
   "description": "Tanstack Application Builder Engine",
   "type": "module",
   "main": "./dist/index.js",
