From 363373996f1ede5d5bc978c60a13b0997fbe4379 Mon Sep 17 00:00:00 2001 From: Daniel Bulant Date: Sat, 8 Jan 2022 15:44:42 +0100 Subject: [PATCH] backup --- notes/conflict-files-obsidian-git.md | 3 +++ notes/notes.md | 1 + 2 files changed, 4 insertions(+) create mode 100644 notes/conflict-files-obsidian-git.md diff --git a/notes/conflict-files-obsidian-git.md b/notes/conflict-files-obsidian-git.md new file mode 100644 index 0000000..94105c9 --- /dev/null +++ b/notes/conflict-files-obsidian-git.md @@ -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 \ No newline at end of file diff --git a/notes/notes.md b/notes/notes.md index d8dcbe9..1718c91 100644 --- a/notes/notes.md +++ b/notes/notes.md @@ -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]]