# 
# 
# patch "roster_merge.cc"
#  from [e3f0c2717ca68ccfddf6f4d99db56ca852c864d4]
#    to [414142034ab57bc6caa224403802c0e98c38cf4f]
# 
============================================================
--- roster_merge.cc	e3f0c2717ca68ccfddf6f4d99db56ca852c864d4
+++ roster_merge.cc	414142034ab57bc6caa224403802c0e98c38cf4f
@@ -165,7 +165,7 @@
 void
 roster_merge_result::clear()
 {
-  node_attr_conflicts.clear();
+  node_name_conflicts.clear();
   file_content_conflicts.clear();
   node_attr_conflicts.clear();
   orphaned_node_conflicts.clear();