2 commits

Author	SHA1	Message	Date
Abe Jellinek	a5393ca0e5	Merge: Keep external annotations on master, don't erase on other ... PDFWorker only re-imports external annotations when the file changes on disk. Keep annotation items corresponding to external annotations so that they don't disappear after the merge (and then come back when the file is edited). Tweaks behavior introduced in 2aa34a6. https://forums.zotero.org/discussion/113943/zotero-7-beta-merging-pdf-files-leaves-ghost-external-annotations	2024-04-25 16:35:09 -04:00
Abe Jellinek	1f9e518581	Duplicates Merge: Preserve embedded annotations (#2728)	2022-08-11 03:52:40 -04:00