--- deliantra/server/Changes	2009/01/25 23:56:13	1.339
+++ deliantra/server/Changes	2009/01/25 23:56:33	1.340
@@ -1,7 +1,6 @@
 Deliantra MORPG Server, Maps and Archetypes ChangeLog.
 Version numbers sort like decimal numbers.
 
-<<<<<<< Changes
 TODO: emergency swap mode is not working
 TODO: xs-warn doesn't end up in server log.
 TODO: 2008-07-13 00:41:27.8762 BUG: process_events(): removed object is on active list: {cnt:8720978,uuid:<1.37c8d364d>,name:"bomb",flags:[2,11],type:102}
@@ -32,15 +31,12 @@
 
 	- convert me command from per-map to chat, which makes more sense, also
           document it.
-
-=======
         - more than one spellbooks of same class can now be given
           in class selection.
         - adjusted the starting_spell.trs treasure list to the recent
           spell rebalancements.
         - the IRC gateway filters IRC colors now.
 
->>>>>>> 1.338
 2.76 Sat Jan 17 08:36:51 CET 2009
 	- (arch) fix quiver of Holding Bolts.
         - applying unpaid items will now examine them.