[Mpuls-commits] r3728 - wasko/trunk

Fri Sep 17 12:35:10 CEST 2010

Author: roland
Date: 2010-09-17 12:35:08 +0200 (Fri, 17 Sep 2010)
New Revision: 3728

Modified:
   wasko/trunk/ChangeLog
Log:
typo

Modified: wasko/trunk/ChangeLog
===================================================================

--- wasko/trunk/ChangeLog	2010-09-17 10:24:25 UTC (rev 3727)
+++ wasko/trunk/ChangeLog	2010-09-17 10:35:08 UTC (rev 3728)
@@ -128,7 +128,6 @@
 
 	* waskoweb/public/images/mpuls.ico: issue619 updated favicon
 
->>>>>>> .r3681
 2010-09-09  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	* waskoweb/templates/casemanagement/digest_body.mako: Issue1023: Use
@@ -462,7 +461,7 @@
 
 2010-06-29 Roland Geider <roland.geider at intevation.de>
 
-	* waskoweb/public/formed/formedtree.xml: fixed probem with RG
+	* waskoweb/public/formed/formedtree.xml: fixed problem with RG
 	* wasko.json: show only the overview of the RG
 
 2010-06-24 Roland Geider <roland.geider at intevation.de>

