From 5a005cd5ae14eebe24cbcf6b896a9d057d107f42 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 26 Mar 2013 02:49:21 -0400
Subject: [PATCH] Fix WebDAV file sync conflict

---
 chrome/content/zotero/xpcom/storage/webdav.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/chrome/content/zotero/xpcom/storage/webdav.js b/chrome/content/zotero/xpcom/storage/webdav.js
index a3ef6de563..a762079bda 100644
--- a/chrome/content/zotero/xpcom/storage/webdav.js
+++ b/chrome/content/zotero/xpcom/storage/webdav.js
@@ -220,15 +220,17 @@ Zotero.Sync.Storage.WebDAV = (function () {
 						
 						var smtime = Zotero.Sync.Storage.getSyncedModificationTime(item.id);
 						if (smtime != mtime) {
-							var localData = { modTime: fmtime };
-							var remoteData = { modTime: mtime };
-							Zotero.Sync.Storage.QueueManager.addConflict(
-								request.name, localData, remoteData
-							);
 							Zotero.debug("Conflict -- last synced file mod time "
 								+ "does not match time on storage server"
 								+ " (" + smtime + " != " + mtime + ")");
-							return false;
+							return {
+								localChanges: false,
+								remoteChanges: false,
+								conflict: {
+									local: { modTime: fmtime },
+									remote: { modTime: mtime }
+								}
+							};
 						}
 					}
 					else {