Mercurial > dive4elements > river
changeset 3367:cccd6183b046
ChangeLog: Removed remains from former conflict.
flys-client/trunk@5054 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Thu, 19 Jul 2012 08:51:01 +0000 |
| parents | 8bedd1fcaeee |
| children | bf080e932d54 |
| files | flys-client/ChangeLog |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-client/ChangeLog Thu Jul 19 08:48:51 2012 +0000 +++ b/flys-client/ChangeLog Thu Jul 19 08:51:01 2012 +0000 @@ -1,3 +1,7 @@ +2012-07-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * ChangeLog: Removed remains from former conflict. + 2012-07-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> * src/main/java/de/intevation/flys/client/client/ui/fixation/FixFunctionSelect.java @@ -349,8 +353,6 @@ src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties: Add showpointlabel stlye attribute. - ->>>>>>> .r4973 2012-07-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> * src/main/java/de/intevation/flys/client/server/auth/plain/Authenticator.java: