bad merge
This commit is contained in:
7
.gitignore
vendored
7
.gitignore
vendored
@ -1,11 +1,4 @@
|
||||
<<<<<<< HEAD
|
||||
.*~
|
||||
abra/catalogue
|
||||
abra/recipes
|
||||
abra/logs
|
||||
=======
|
||||
*~
|
||||
abra/catalogue
|
||||
abra/recipes
|
||||
abra/logs
|
||||
>>>>>>> origin/main
|
||||
|
||||
Reference in New Issue
Block a user