www

commit a6b8633f2e88607c2e7046eade2f88c04f1784a4
parent d58221b59f41e09ba9f48040f69f0d54711f5d77
Author: Dan Stillman <dstillman@zotero.org>
Date:   Thu,  3 Mar 2011 17:54:15 +0000

Remove tag conflict pop-up


Diffstat:
M
chrome/content/zotero/xpcom/sync.js
 | 
2
++

1 file changed, 2 insertions(+), 0 deletions(-)
diff --git 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();