merged with main, coflict resolved
This commit is contained in:
commit
dbfcf0b3fe
|
@ -25,7 +25,13 @@ node_modules/
|
|||
|
||||
# ignore local personal files
|
||||
*.geany
|
||||
<<<<<<< HEAD
|
||||
.vscode/
|
||||
.DS_Store
|
||||
theme/
|
||||
_gitignore*
|
||||
=======
|
||||
.DS_Store
|
||||
theme/
|
||||
|
||||
>>>>>>> main
|
||||
|
|
Loading…
Reference in New Issue