[Mpuls-commits] r4506 - wasko/trunk

[scm-commit@wald.intevation.org]

Author: bh
Date: 2011-01-19 18:58:47 +0100 (Wed, 19 Jan 2011)
New Revision: 4506

Modified:
   wasko/trunk/ChangeLog
Log:
Remove conflict marker that was checked in accidentally.


Modified: wasko/trunk/ChangeLog
===================================================================
--- wasko/trunk/ChangeLog	2011-01-19 16:11:25 UTC (rev 4505)
+++ wasko/trunk/ChangeLog	2011-01-19 17:58:47 UTC (rev 4506)
@@ -118,7 +118,6 @@
 	* waskoweb/public/formed/formedtree.xml: Regenerate with current
 	version of formed.
 
->>>>>>> .r4504
 2010-11-10  Roland Geider <roland.geider at intevation.de>
 
 	* setup.py,