Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 9601)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 9602)
@@ -115,5 +115,4 @@
 
 
->>>>>>> 1.4293
  2010/06/24 Daniela Dorner