[[snapshot]]: 2021-05-08 02:03:38

Affected files:

.obsidian/plugins/obsidian-git/data.json
conflict-files-obsidian-git.md
This commit is contained in:
2021-05-08 02:03:38 +02:00
parent c8f27435ac
commit 045d990860
2 changed files with 5 additions and 1 deletions
+1 -1
View File
@@ -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)"}
{"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)"}
+4
View File
@@ -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