bad merge

This commit is contained in:
2026-02-26 22:22:44 -08:00
parent b7efd7f718
commit 87b78d99af

7
.gitignore vendored
View File

@ -1,11 +1,4 @@
<<<<<<< HEAD
.*~
abra/catalogue
abra/recipes
abra/logs
=======
*~
abra/catalogue
abra/recipes
abra/logs
>>>>>>> origin/main