[Mpuls-commits] r4507 - base/trunk

[scm-commit@wald.intevation.org]

Author: bh
Date: 2011-01-19 19:12:40 +0100 (Wed, 19 Jan 2011)
New Revision: 4507

Modified:
   base/trunk/ChangeLog
Log:
Remove conflict markers that were checked in accidentally.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2011-01-19 17:58:47 UTC (rev 4506)
+++ base/trunk/ChangeLog	2011-01-19 18:12:40 UTC (rev 4507)
@@ -1885,7 +1885,6 @@
 	* mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po: issue1064: consequent use
 	  of the word "Einwilligungserklaerung" for the declaration of consent
 
->>>>>>> .r3652
 2010-09-09  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	Issue1023:
@@ -2669,7 +2668,6 @@
 	errors as HTML
 	Requires libformed revision 209:efef2d1727d3
 
->>>>>>> .r3346
 2010-08-03  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	Issue664:
@@ -3321,7 +3319,6 @@
 	informative debug logs
 	(MpulsCase.__getattr__): Improve debug log contents.
 
->>>>>>> .r3045
 2010-06-11  Torsten Irländer <torsten.irlaender at intevation.de>
 	
 	Changed validity icons. Ported from 1.7.1 branch of waska