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