[Mpuls-commits] r4541 - wasko/trunk

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2011-02-01 09:57:30 +0100 (Tue, 01 Feb 2011)
New Revision: 4541

Modified:
   wasko/trunk/ChangeLog
Log:
Updated ChangeLog


Modified: wasko/trunk/ChangeLog
===================================================================
--- wasko/trunk/ChangeLog	2011-02-01 08:54:50 UTC (rev 4540)
+++ wasko/trunk/ChangeLog	2011-02-01 08:57:30 UTC (rev 4541)
@@ -1,4 +1,3 @@
-<<<<<<< .mine
 2011-02-01  Torsten Irlaender <torsten at intevation.de>
 
 	* wasko.json: Issue1744: Adapted dates to a new evaluation period