www

commit 080b3cad87bcbb5aae6beedb472fd5bbc14d3ffa
parent 9b133c40aace7a3afbb8263f954619321cbc5c16
Author: Dan Stillman <dstillman@zotero.org>
Date:   Wed,  4 Jan 2012 14:39:51 -0500

Don't break everything

Diffstat:
M
chrome/content/zotero/xpcom/data/item.js
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js
@@ -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(),