merged with main, coflict resolved

added exceptions of underscorestw to gitignore
added type of file to gitignore
2023-01-07 13:48:36 +01:00 · 2022-10-25 00:45:04 +02:00 · 2022-10-25 00:38:31 +02:00
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
Author	SHA1	Message	Date
jorge	dbfcf0b3fe	merged with main, coflict resolved	2023-01-07 13:48:36 +01:00
jorge	a0bb35b072	added exceptions of underscorestw to gitignore	2022-10-25 00:45:04 +02:00
jorge	89cd4f4576	added type of file to gitignore	2022-10-25 00:38:31 +02:00