--- deliantra/Deliantra-Client/Changes	2007/12/26 15:18:15	1.31
+++ deliantra/Deliantra-Client/Changes	2007/12/26 15:19:56	1.32
@@ -1,16 +1,11 @@
 Revision history for Perl extension CFPlus
 
-<<<<<<< Changes
-	- do not render some glyphs twice. doh.
-=======
-TODO: currently running at maximum refresh
-	- fixed unneccessary repeation when fireing in a direction
+	- fixed unneccessary repetition when firing in a direction
           when 'only shift-up stops fire' is off.
-	- do not render all glyphs twice. doh.
->>>>>>> 1.30
-        - updated the dejavu fonts to version 2.22.
+	- do not render some glyphs twice. doh.
         - fix two problems that would cause endless
           refreshes even when idle (up to 60Hz).
+        - updated the dejavu fonts to version 2.22.
 
 0.9961 Tue Dec 25 20:22:51 CET 2007
 	- fix texture-reload problems when changing resolutions