#
#
# patch "roster_merge.cc"
#  from [b94e99f3b8207cf675f7159f483e426fbc892f16]
#    to [cf03960d1203f4a525d986e6df8920279e2c2b92]
#
============================================================
--- roster_merge.cc	b94e99f3b8207cf675f7159f483e426fbc892f16
+++ roster_merge.cc	cf03960d1203f4a525d986e6df8920279e2c2b92
@@ -119,10 +119,10 @@ void
 }
 
 void
-roster_merge_result::log_conflicts() const
+conflicts_t::log_conflicts() const
 {
   string str;
-  debug_describe_conflicts(conflicts, str);
+  debug_describe_conflicts(*this, str);
   L(FL("%s") % str);
 }