mirror of
https://github.com/danbulant/notes
synced 2026-07-05 11:00:52 +00:00
backup
This commit is contained in:
parent
eb9a2abe75
commit
363373996f
2 changed files with 4 additions and 0 deletions
3
notes/conflict-files-obsidian-git.md
Normal file
3
notes/conflict-files-obsidian-git.md
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
# conflict-files-obsidian-git
|
||||||
|
Please resolve them and commit per command (This file will be deleted before the commit).
|
||||||
|
- Not a file: notes/.obsidian/plugins/obsidian-activity-history/data.json
|
||||||
|
|
@ -7,6 +7,7 @@ noteOnly: true
|
||||||
%% Zoottelkeeper: Beginning of the autogenerated index file list %%
|
%% Zoottelkeeper: Beginning of the autogenerated index file list %%
|
||||||
- [[ang/ang|ang]]
|
- [[ang/ang|ang]]
|
||||||
- [[cjl/cjl|cjl]]
|
- [[cjl/cjl|cjl]]
|
||||||
|
- [[conflict-files-obsidian-git|conflict-files-obsidian-git]]
|
||||||
- [[conflict-files-obsidian-gitpu|conflict-files-obsidian-gitpu]]
|
- [[conflict-files-obsidian-gitpu|conflict-files-obsidian-gitpu]]
|
||||||
- [[data/data|data]]
|
- [[data/data|data]]
|
||||||
- [[dej/dej|dej]]
|
- [[dej/dej|dej]]
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue