resolve conflic
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -2,4 +2,4 @@
|
|||||||
/logseq/.recycle/**
|
/logseq/.recycle/**
|
||||||
/to_delete/*
|
/to_delete/*
|
||||||
.stignore
|
.stignore
|
||||||
|
**/.DS_Store
|
||||||
|
|||||||
Reference in New Issue
Block a user