From 6e1fcf68f480cde8da8e4a2166c3486bf13b1a37 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 14 Aug 2023 10:27:03 +0800
Subject: [PATCH] #

---
 .gitignore                                        |  1 +
 ...ins.sync-conflict-20230716-185619-CALEDER.json | 15 ---------------
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 .obsidian/community-plugins.sync-conflict-20230716-185619-CALEDER.json

diff --git a/.gitignore b/.gitignore
index 90f64cb..2c5d0f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /.obsidian/workspace*.*
+*conflict*
diff --git a/.obsidian/community-plugins.sync-conflict-20230716-185619-CALEDER.json b/.obsidian/community-plugins.sync-conflict-20230716-185619-CALEDER.json
deleted file mode 100644
index 2f90ba1..0000000
--- a/.obsidian/community-plugins.sync-conflict-20230716-185619-CALEDER.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  "obsidian-style-settings",
-  "table-editor-obsidian",
-  "obsidian-quiet-outline",
-  "obsidian-enhancing-mindmap",
-  "obsidian-auto-link-title",
-  "cm-editor-syntax-highlight-obsidian",
-  "markdown-prettifier",
-  "emoji-shortcodes",
-  "obsidian-emoji-toolbar",
-  "obsidian-enhancing-export",
-  "obsidian-git",
-  "obsidian-pandoc",
-  "calendar"
-]
\ No newline at end of file