chore: fix gitignore bad merge

This commit is contained in:
Kayvan Sylvan 2026-04-06 08:43:19 -07:00
parent febf2c429c
commit ceec9335c1

6
.gitignore vendored
View file

@ -328,11 +328,5 @@ tmp/
# Claude MEMORY directory # Claude MEMORY directory
MEMORY/ MEMORY/
<<<<<<< HEAD
# Maestro artifacts # Maestro artifacts
.maestro .maestro
=======
# Maestro directory
.maestro/
>>>>>>> main