From 410a8ea234bc7516cc2ea2d1d968f608822996d2 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Sat, 8 May 2021 01:53:40 +0200
Subject: [PATCH]  Auto: misc.

---
 .obsidian/plugins/obsidian-git/data.json | 2 +-
 conflict-files-obsidian-git.md           | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 100644 conflict-files-obsidian-git.md

diff --git a/.obsidian/plugins/obsidian-git/data.json b/.obsidian/plugins/obsidian-git/data.json
index 913235b0a..490cb6892 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 01:53:27 GMT+0200 (Central European Summer Time)","lastAutoPull":"Sat May 08 2021 01:52:27 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 01:53:27 GMT+0200 (Central European Summer Time)","lastAutoPull":"Sat May 08 2021 01:53:27 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
deleted file mode 100644
index d3a6c7a94..000000000
--- a/conflict-files-obsidian-git.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# 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
\ No newline at end of file