--- deliantra/server/Changes	2008/04/20 18:48:51	1.100
+++ deliantra/server/Changes	2008/04/20 18:49:25	1.101
@@ -17,16 +17,11 @@
         - implement an "incremental garbage collector" for archetypes.
         - (maps, arch) the scorn go club was founded!
         - (arch) do no longer support player abilities, they didn't work anyways.
-<<<<<<< Changes
         - (arch) the alchemy spell is now of the alchemy spell school, which
           became a real spell-class.
-        - examine comamnd now uses the examine infobox.
-        - enable slice allocator again, was accidentally disabled in 2.5.
-=======
-        - (arch) the alchemy spell is now of the alchemy spell school.
+        - examine command now uses the examine infobox.
         - (arch) the alchemist class now get an alchemy spell book for new characters.
         - enable slice allocator again.
->>>>>>> 1.99
         - implement optional free memory poisoning.
 
 2.5  Wed Apr 16 15:06:53 CEST 2008