From 045d99086071b0ef3b8b92bbcee5565af9edc961 Mon Sep 17 00:00:00 2001 From: Flancian <0@flancia.org> Date: Sat, 8 May 2021 02:03:38 +0200 Subject: [PATCH] [[snapshot]]: 2021-05-08 02:03:38 Affected files: .obsidian/plugins/obsidian-git/data.json conflict-files-obsidian-git.md --- .obsidian/plugins/obsidian-git/data.json | 2 +- conflict-files-obsidian-git.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 conflict-files-obsidian-git.md diff --git a/.obsidian/plugins/obsidian-git/data.json b/.obsidian/plugins/obsidian-git/data.json index 1895ef00b..e2b8eec37 100644 --- a/.obsidian/plugins/obsidian-git/data.json +++ b/.obsidian/plugins/obsidian-git/data.json @@ -1 +1 @@ -{"commitMessage":"[[snapshot]]: {{date}}","commitDateFormat":"YYYY-MM-DD HH:mm:ss","autoSaveInterval":1,"autoPullInterval":1,"autoPullOnBoot":true,"disablePush":false,"pullBeforePush":true,"disablePopups":false,"listChangedFilesInMessageBody":true,"showStatusBar":true,"lastAutoBackUp":"Sat May 08 2021 02:02:38 GMT+0200 (Central European Summer Time)","lastAutoPull":"Sat May 08 2021 02:02:46 GMT+0200 (Central European Summer Time)"} \ No newline at end of file +{"commitMessage":"[[snapshot]]: {{date}}","commitDateFormat":"YYYY-MM-DD HH:mm:ss","autoSaveInterval":1,"autoPullInterval":1,"autoPullOnBoot":true,"disablePush":false,"pullBeforePush":true,"disablePopups":false,"listChangedFilesInMessageBody":true,"showStatusBar":true,"lastAutoBackUp":"Sat May 08 2021 02:03:38 GMT+0200 (Central European Summer Time)","lastAutoPull":"Sat May 08 2021 02:02:46 GMT+0200 (Central European Summer Time)"} \ No newline at end of file diff --git a/conflict-files-obsidian-git.md b/conflict-files-obsidian-git.md new file mode 100644 index 000000000..7aaa3aec4 --- /dev/null +++ b/conflict-files-obsidian-git.md @@ -0,0 +1,4 @@ +# Conflict files +Please resolve them and commit per command (This file will be deleted before the commit). +- Not a file: .obsidian/plugins/obsidian-git/data.json +- Not a file: .obsidian/workspace \ No newline at end of file