--- deliantra/Deliantra-Client/Changes	2008/05/05 20:22:03	1.79
+++ deliantra/Deliantra-Client/Changes	2008/05/08 18:58:55	1.82
@@ -1,5 +1,13 @@
 Revision history for Perl extension Deliantra::Client
 
+<<<<<<< Changes
+TODO: close contaienr on disocnnect
+=======
+0.9972
+	- added default (0) for the shift_fire_stop setting
+>>>>>>> 1.81
+	- write client.cf in pretty-printed-json.
+
 0.9971 Mon May  5 21:37:33 CEST 2008
 	- reverse order of items in floorbox.
 	- sort right side of inventory by floor order.