# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1342191876 0
# Node ID fd3243d892a9d655aac3c271521cfec1ed9d8774
# Parent  5ccd51ca11ce511185e1bc13d3b02d5c14316b86
Fixed ChangeLog

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

diff -r 5ccd51ca11ce -r fd3243d892a9 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Fri Jul 13 14:25:16 2012 +0000
+++ b/flys-artifacts/ChangeLog	Fri Jul 13 15:04:36 2012 +0000
@@ -1,17 +1,14 @@
-<<<<<<< .mine
 2012-07-13	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java:
 	  Fixed problem with string operation precedence.
 
-=======
 2012-07-13	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	* doc/conf/meta-data.xml: very basic official lines matching the current
 	  artifact (for this it is wrongly placed in previous calc.-part, for
 	  now.
 
->>>>>>> .r4996
 2012-07-13	Christian Lins	<christian.lins@intevation.de>
 
 	* src/main/java/de/intevation/flys/utils/MapfileGenerator.java: