bad merge

This commit is contained in:
2026-02-26 22:22:44 -08:00
parent 46c1b113ee
commit f1c79ecd51
-7
View File
@@ -1,11 +1,4 @@
<<<<<<< HEAD
.*~
abra/catalogue
abra/recipes
abra/logs
=======
*~
abra/catalogue
abra/recipes
abra/logs
>>>>>>> origin/main