From 99f1cec9f7904c92974821a66663c95105ea3c13 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Fri, 14 May 2021 21:04:16 +0200
Subject: [PATCH] [[snapshot]]: 2021-05-14 21:04:16

Affected files:

conflict-files-obsidian-git.md
---
 conflict-files-obsidian-git.md | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 conflict-files-obsidian-git.md

diff --git a/conflict-files-obsidian-git.md b/conflict-files-obsidian-git.md
deleted file mode 100644
index c8ba493b9..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/workspace
\ No newline at end of file