[Mpuls-commits] r4673 - base/trunk

[scm-commit@wald.intevation.org]

Author: bh
Date: 2011-02-21 20:14:41 +0100 (Mon, 21 Feb 2011)
New Revision: 4673

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


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2011-02-21 18:30:10 UTC (rev 4672)
+++ base/trunk/ChangeLog	2011-02-21 19:14:41 UTC (rev 4673)
@@ -141,7 +141,6 @@
 	  mpulsweb/controllers/usersettings.py
 	  mpulsweb/controllers/settings.py: Update of the msgids. (Part 2)
 
->>>>>>> .r4657
 2011-02-17  Roland Geider <roland.geider at intevation.de>
 
 	* mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po,
@@ -268,7 +267,6 @@
 	Simplify the control flow a little by exiting early if the page
 	wasn't found.
 
->>>>>>> .r4616
 2011-02-09  Torsten Irlaender <torsten at intevation.de>
 
 	* mpulsweb/controllers/usersettings.py