From a6b8633f2e88607c2e7046eade2f88c04f1784a4 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 3 Mar 2011 17:54:15 +0000 Subject: [PATCH] Remove tag conflict pop-up --- chrome/content/zotero/xpcom/sync.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/chrome/content/zotero/xpcom/sync.js b/chrome/content/zotero/xpcom/sync.js index 0645aefca7..cc3f2df18a 100644 --- a/chrome/content/zotero/xpcom/sync.js +++ b/chrome/content/zotero/xpcom/sync.js @@ -3363,6 +3363,7 @@ Zotero.Sync.Server.Data = new function() { var linkedItems = targetObj.getLinkedItems(true); targetObj.linkedItems = linkedItems.concat(otherDiff.linkedItems); + /* var msg = _generateTagItemMergeMessage( targetObj.name, otherDiff.linkedItems, @@ -3370,6 +3371,7 @@ Zotero.Sync.Server.Data = new function() { ); // TODO: log rather than alert alert(msg); + */ } targetObj.save();