diff --git a/ankiqt/ui/sync.py b/ankiqt/ui/sync.py index 0c400c32a..f3f275c3b 100755 --- a/ankiqt/ui/sync.py +++ b/ankiqt/ui/sync.py @@ -159,7 +159,8 @@ class Sync(QThread): remoteSync = proxy._lastSync() minSync = min(localSync, remoteSync) self.conflictResolution = None - if minSync > 0 and localMod > minSync and remoteMod > minSync: + if (localMod != remoteMod and minSync > 0 and + localMod > minSync and remoteMod > minSync): self.emit(SIGNAL("syncConflicts"), syncName) while not self.conflictResolution: time.sleep(0.2)