merged with main, coflict resolved

2023-01-07 13:48:36 +01:00 · 2023-01-07 13:48:36 +01:00 · dbfcf0b3fe
parent ad5777f611 a0bb35b072
commit dbfcf0b3fe
1 changed files with 6 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -25,7 +25,13 @@ node_modules/
 # ignore local personal files
 *.geany
 <<<<<<< HEAD
 .vscode/
 .DS_Store
 theme/
 _gitignore*
 =======
 .DS_Store
 theme/
 >>>>>>> main