suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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; var otherNote = otherData.note;
// Stop non-Unix newlines from triggering erroneous conflicts // 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"); otherNote = otherNote.replace(/\r\n?/g, "\n");
// Normalize multiple spaces (due to differences TinyMCE, Z.U.text2html(), // Normalize multiple spaces (due to differences TinyMCE, Z.U.text2html(),