From e5e81d57155c4ad3d9a3a9ab69ba5450528b032f Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Fri, 20 Nov 2015 13:28:29 +0100 Subject: [PATCH] Loosen up equality check in conflict_res --- vdirsyncer/sync.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vdirsyncer/sync.py b/vdirsyncer/sync.py index ef66d0c..fb99672 100644 --- a/vdirsyncer/sync.py +++ b/vdirsyncer/sync.py @@ -270,7 +270,7 @@ def _action_conflict_resolve(ident): meta_a = a.idents[ident] meta_b = b.idents[ident] - if meta_a['item'].raw == meta_b['item'].raw: + if meta_a['item'].hash == meta_b['item'].hash: sync_logger.info(u'...same content on both sides.') a.status[ident] = meta_a['href'], meta_a['etag'] b.status[ident] = meta_b['href'], meta_b['etag']