Compare commits
No commits in common. "dbfcf0b3fe6d87a44a3b50f962a159ade736c721" and "ad5777f61142e198b2bef5efc27e727ffc8b2ee0" have entirely different histories.
dbfcf0b3fe
...
ad5777f611
|
@ -25,13 +25,7 @@ node_modules/
|
||||||
|
|
||||||
# ignore local personal files
|
# ignore local personal files
|
||||||
*.geany
|
*.geany
|
||||||
<<<<<<< HEAD
|
|
||||||
.vscode/
|
.vscode/
|
||||||
.DS_Store
|
.DS_Store
|
||||||
theme/
|
theme/
|
||||||
_gitignore*
|
_gitignore*
|
||||||
=======
|
|
||||||
.DS_Store
|
|
||||||
theme/
|
|
||||||
|
|
||||||
>>>>>>> main
|
|
||||||
|
|
Loading…
Reference in New Issue