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