This commit is contained in:
Daniel Bulant 2022-01-08 15:44:42 +01:00
parent eb9a2abe75
commit 363373996f
2 changed files with 4 additions and 0 deletions

View 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

View file

@ -7,6 +7,7 @@ noteOnly: true
%% Zoottelkeeper: Beginning of the autogenerated index file list %%
- [[ang/ang|ang]]
- [[cjl/cjl|cjl]]
- [[conflict-files-obsidian-git|conflict-files-obsidian-git]]
- [[conflict-files-obsidian-gitpu|conflict-files-obsidian-gitpu]]
- [[data/data|data]]
- [[dej/dej|dej]]