From 87b78d99aff099ff5ba1aeebfa00edabfe94ffc6 Mon Sep 17 00:00:00 2001
From: Linnea <linnealovespie@proton.me>
Date: Thu, 26 Feb 2026 22:22:44 -0800
Subject: [PATCH] bad merge

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

diff --git a/.gitignore b/.gitignore
index 4687843..5c54467 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,4 @@
-<<<<<<< HEAD
-.*~
-abra/catalogue
-abra/recipes
-abra/logs
-=======
 *~
 abra/catalogue
 abra/recipes
 abra/logs
->>>>>>> origin/main