From ceec9335c1ba88ee901bb339d26bd87f0b665cf4 Mon Sep 17 00:00:00 2001
From: Kayvan Sylvan <kayvan@sylvan.com>
Date: Mon, 6 Apr 2026 08:43:19 -0700
Subject: [PATCH] chore: fix gitignore bad merge

---
 .gitignore | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index c0c3462c..d8a7e544 100644
--- a/.gitignore
+++ b/.gitignore
@@ -328,11 +328,5 @@ tmp/
 # Claude MEMORY directory
 MEMORY/
 
-<<<<<<< HEAD
 # Maestro artifacts
 .maestro
-
-=======
-# Maestro directory
-.maestro/
->>>>>>> main