# 
# 
# patch "ChangeLog"
#  from [8271c4fdf364936b8cb13ae8a2f73517fd2dac63]
#    to [0b55b182e4bb56af32f85b11f62305cba6b4333a]
# 
# patch "roster_merge.cc"
#  from [f21aa23ed645ee27e9449bdea9e8cab454c086ca]
#    to [5a17827e8f84c0c8576f01e79c225a48b27c5505]
# 
============================================================
--- ChangeLog	8271c4fdf364936b8cb13ae8a2f73517fd2dac63
+++ ChangeLog	0b55b182e4bb56af32f85b11f62305cba6b4333a
@@ -1,3 +1,7 @@
+2006-02-18  Nathaniel Smith  <address@hidden>
+
+	* roster_merge.cc (roster_merge): Remove obsolete FIXME.
+
 2005-10-19  Matthew A. Nicholson  <address@hidden>
 
 	* contrib/monotone.bash_completion: Update for 0.25.
============================================================
--- roster_merge.cc	f21aa23ed645ee27e9449bdea9e8cab454c086ca
+++ roster_merge.cc	5a17827e8f84c0c8576f01e79c225a48b27c5505
@@ -530,8 +530,6 @@
     I(right_mi == right_marking.end());
     I(new_i == result.roster.all_nodes().end());
   }
-
-  // FIXME: looped nodes here
 }
 
 #ifdef BUILD_UNIT_TESTS