FIXUP

Author: Aegis Stack

CLAUDE.md

@@ -32,11 +32,7 @@ Each generated project includes:
 
 ## Installation
 
-<<<<<<< HEAD
-**Current Version**: 0.6.9rc1
-=======
 **Current Version**: 0.6.9
->>>>>>> ccea442 (v0.6.9-rc1)
 
 ```bash
 pip install aegis-stack

aegis/__init__.py

@@ -2,8 +2,4 @@
 Aegis Stack CLI - Component generation and project management tools.
 """
 
-<<<<<<< HEAD
-__version__ = "0.6.9rc1"
-=======
 __version__ = "0.6.9"
->>>>>>> ccea442 (v0.6.9-rc1)

copier.yml

@@ -6,11 +6,7 @@
 # - Update support
 
 _min_copier_version: "9.0.0"
-<<<<<<< HEAD
-_version: "0.6.9rc1"
-=======
 _version: "0.6.9"
->>>>>>> ccea442 (v0.6.9-rc1)
 
 # IMPORTANT: Template content is in subdirectory
 # This allows the template to be recognized as git-tracked (aegis-stack repo root has .git)

pyproject.toml

@@ -1,10 +1,6 @@
 [project]
 name = "aegis-stack"
-<<<<<<< HEAD
-version = "0.6.9rc1"
-=======
 version = "0.6.9"
->>>>>>> ccea442 (v0.6.9-rc1)
 description = "A production-ready FastAPI platform with modular components and a built-in control plane. Try: uvx aegis-stack init my-project"
 readme = "README.md"
 requires-python = ">=3.11,<3.15"