resolve conflic

This commit is contained in:
YuanHui
2025-01-11 15:18:01 +08:00
committed by lostecho
parent 0794bc911d
commit 0ce92650ca
2 changed files with 1 additions and 1 deletions

BIN
.DS_Store vendored

Binary file not shown.

2
.gitignore vendored
View File

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