Merge remote-tracking branch 'git/main'

1 year ago · 380a36fa68
parent e4ed49541d 0a24f243dd
commit 380a36fa68
3 changed files with 2 additions and 1 deletions
--- a/.stignore
+++ b/.stignore
@ -1,5 +1,6 @@
 .obsidian/workspace.json
 .obsidian/workspace*.json
 .git
-~$*.*
+**/~$*.*
 recycle
+.trash
--- a/SD/atta/mmexport1713204119841.png
+++ b/SD/atta/mmexport1713204119841.png
--- a/SD/atta/mmexport1713204122262.png
+++ b/SD/atta/mmexport1713204122262.png