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

Don't break everything

Browse source
This commit is contained in:
Dan Stillman 2012-01-04 14:39:51 -05:00
parent 9b133c40aa
commit 080b3cad87
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chrome/content/zotero/xpcom/data/item.js
View file

@ -3748,7 +3748,7 @@ Zotero.Item.prototype.diff = function (item, includeMatches, ignoreFields) {
var otherNote = otherData.note;
// Stop non-Unix newlines from triggering erroneous conflicts
thisNote = thisNote.replace(/(\r\n?/g, "\n");
thisNote = thisNote.replace(/\r\n?/g, "\n");
otherNote = otherNote.replace(/\r\n?/g, "\n");
// Normalize multiple spaces (due to differences TinyMCE, Z.U.text2html(),