--- deliantra/Deliantra-Client/Changes	2008/05/06 14:37:13	1.80
+++ deliantra/Deliantra-Client/Changes	2008/05/08 18:58:55	1.82
@@ -1,5 +1,11 @@
 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