diff --git a/notes/.obsidian/plugins/obsidian-activity-history/data.json b/notes/.obsidian/plugins/obsidian-activity-history/data.json index 65e514f..f56b899 100644 --- a/notes/.obsidian/plugins/obsidian-activity-history/data.json +++ b/notes/.obsidian/plugins/obsidian-activity-history/data.json @@ -220,9 +220,21 @@ "date": "2021-12-11", "value": 0 }, + { + "date": "2021-12-10", + "value": 4093 + }, + { + "date": "2021-12-11", + "value": 0 + }, { "date": "2021-12-13", "value": 15651 + }, + { + "date": "2021-12-14", + "value": 60000 } ] } 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 8c1a68d..38eee72 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]] - [[data/data|data]] - [[dej/dej|dej]] - [[ech/ech|ech]]