--- AnyEvent-MP/Changes	2012/02/26 10:29:59	1.116
+++ AnyEvent-MP/Changes	2012/02/26 11:12:54	1.117
@@ -12,17 +12,16 @@
 faq: all is asynch
 faq: how to interface to non-perl nodes?
 
-<<<<<<< Changes
 TODO: Anyevent::MP gets grp_reg, grp_get
 TODO: AnyEvent::MP keeps list of all "global" nodes
 TODO: Global loaded on demand only, adds grp database and node address database
 TODO: transport connects use any global node to find addresses (maybe itself)
 TODO: not really
+TODO: configure norc => 1, force => 1
 
 	- move seed code to Kernel.
         - fixed small typo in AnyEvent::MP::Transport.
 
->>>>>>> 1.115
 1.30 Thu Jun 30 11:30:39 CEST 2011
 	- connection errors at the right time would kill node
           connections in a bad way (patch by Malcolm Studd).