[Mpuls-commits] r1621 - wasko/branches/2.0

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-02-16 14:34:43 +0100 (Tue, 16 Feb 2010)
New Revision: 1621

Modified:
   wasko/branches/2.0/ChangeLog
Log:
Remove a merge conflict marker accidentally left in.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-16 13:07:08 UTC (rev 1620)
+++ wasko/branches/2.0/ChangeLog	2010-02-16 13:34:43 UTC (rev 1621)
@@ -152,7 +152,6 @@
 	be loaded, the application will not work correctly anyway, so it's
 	better to fail early and noisily.
 
->>>>>>> .r1589
 2010-02-15  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	* waskaweb/controllers/case.py: Import CaseAppointmentFactory from