--- deliantra/server/Changes	2009/10/12 04:02:16	1.424
+++ deliantra/server/Changes	2009/10/12 04:02:42	1.425
@@ -51,6 +51,7 @@
         - party spells didn't work all that well.
         - added complex object matching framework (cf::match), and make altars
           and pedestals use it.
+        - identified skill-tools show what skill they grant.
         - display the duration of change_ability spells when examining them
           (missing: protection spells, but they are a hack...).
         - improve effectiveness of special foods created by woodsman skill,
@@ -75,13 +76,8 @@
         - (arch) add name_pl fields and documentation for building materials.
         - (maps) random fountains no longer generate permanent stat increases.
         - fix transmutation alchemy.
-<<<<<<< Changes
-        - enable the object loader to also dump archetypes.
         - speed up many frequently-invoked C->perl callbacks.
-=======
         - added complex object matching framework, to be used in altars and the like.
-        - identified skill-tools show what skill they grant.
->>>>>>> 1.423
 
 2.80 Tue Sep 15 20:22:31 CEST 2009
 	- fix the "screen stays black on login" bug and remove debug instrumentation