Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 2541)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 2542)
@@ -556,5 +556,4 @@
        for the parameters of the 2-dim function describing the shower
        image
->>>>>>> 1.777