From 9344db61c8b1ef97c17c94b151e6c0336cbcbb86 Mon Sep 17 00:00:00 2001
From: Mike Connor <mconnor@mozilla.com>
Date: Tue, 29 Sep 2009 18:40:18 -0700
Subject: [PATCH] fix merge fail

---
 services/sync/modules/service.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/services/sync/modules/service.js b/services/sync/modules/service.js
index 31b46a527f33..e9bd04cbc9ab 100644
--- a/services/sync/modules/service.js
+++ b/services/sync/modules/service.js
@@ -1089,8 +1089,6 @@ WeaveSvc.prototype = {
       return;
     }
 
-    fullSync = true; // not doing thresholds yet
-
     // Make sure we should sync or record why we shouldn't
     let reason = this._checkSync();
     if (reason) {