# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1319792568 0
# Node ID 5a1d59926a7291ec7ce2a9414fd4a54645406e33
# Parent  a8aa343799a210d21b89d02265cc1edbd4f6ea99
Fixed incorrect ChangeLog-merge.

flys-artifacts/trunk@3100 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r a8aa343799a2 -r 5a1d59926a72 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Fri Oct 28 09:00:51 2011 +0000
+++ b/flys-artifacts/ChangeLog	Fri Oct 28 09:02:48 2011 +0000
@@ -1,8 +1,3 @@
-2011-10-28  Ingo Weinzierl <ingo@intevation.de>
-
-	* src/main/java/de/intevation/flys/exports/MapGenerator.java: Bugfix:
-	  Catch IOException - flys-artifacts compiles again.
-
 2011-10-28	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	Extracted getFlysContext from FLYSArtifacts into FLYSUtils.
@@ -19,6 +14,11 @@
 
 2011-10-28  Ingo Weinzierl <ingo@intevation.de>
 
+	* src/main/java/de/intevation/flys/exports/MapGenerator.java: Bugfix:
+	  Catch IOException - flys-artifacts compiles again.
+
+2011-10-28  Ingo Weinzierl <ingo@intevation.de>
+
 	* doc/conf/artifacts/winfo.xml: Defined "floodmap.barriers" as valid facet
 	  for floodmaps.