Mercurial > dive4elements > river
diff flys-artifacts/ChangeLog @ 3309:fd3243d892a9
Fixed ChangeLog
flys-artifacts/trunk@4998 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Fri, 13 Jul 2012 15:04:36 +0000 |
| parents | 5ccd51ca11ce |
| children | 8af1111af180 |
line wrap: on
line diff
--- 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: