resolve conflic

This commit is contained in:
YuanHui
2025-01-11 15:18:01 +08:00
parent 740430820c
commit b9182a97cc
2 changed files with 1 additions and 1 deletions

2
.gitignore vendored
View File

@@ -2,4 +2,4 @@
/logseq/.recycle/**
/to_delete/*
.stignore
**/.DS_Store