mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Remove tag conflict pop-up

Browse source
This commit is contained in:
Dan Stillman 2011-03-03 17:54:15 +00:00
parent d58221b59f
commit a6b8633f2e
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
chrome/content/zotero/xpcom/sync.js
View file

@ -3363,6 +3363,7 @@ Zotero.Sync.Server.Data = new function() {
var linkedItems = targetObj.getLinkedItems(true); var linkedItems = targetObj.getLinkedItems(true);
targetObj.linkedItems = linkedItems.concat(otherDiff.linkedItems); targetObj.linkedItems = linkedItems.concat(otherDiff.linkedItems);
/*
var msg = _generateTagItemMergeMessage( var msg = _generateTagItemMergeMessage(
targetObj.name, targetObj.name,
otherDiff.linkedItems, otherDiff.linkedItems,
@ -3370,6 +3371,7 @@ Zotero.Sync.Server.Data = new function() {
); );
// TODO: log rather than alert // TODO: log rather than alert
alert(msg); alert(msg);
*/
} }
targetObj.save(); targetObj.save();