From 0f024ceb0e1c4372a1b2c9b94b8d94a1569d6aea Mon Sep 17 00:00:00 2001
From: Dane Sabo <dane.sabo@pitt.edu>
Date: Tue, 10 Sep 2024 10:03:41 -0400
Subject: [PATCH] vault backup: 2024-09-10 10:03:41

---
 .../plugins/obsidian-pandoc-reference-list/data.json   | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/.obsidian/plugins/obsidian-pandoc-reference-list/data.json b/.obsidian/plugins/obsidian-pandoc-reference-list/data.json
index 46ee11201..7c7e0121e 100755
--- a/.obsidian/plugins/obsidian-pandoc-reference-list/data.json
+++ b/.obsidian/plugins/obsidian-pandoc-reference-list/data.json
@@ -1,17 +1,7 @@
 {
   "pathToPandoc": "/app/bin/pandoc",
   "tooltipDelay": 400,
-<<<<<<< HEAD
-  "zoteroGroups": [
-    {
-      "id": 1,
-      "name": "My Library",
-      "lastUpdate": 1725567832585
-    }
-  ],
-=======
   "zoteroGroups": [],
->>>>>>> origin/master
   "renderCitations": true,
   "renderCitationsReadingMode": true,
   "renderLinkCitations": true