# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1342687861 0
# Node ID cccd6183b0464aa9e09baeec6b27f7fa958339f3
# Parent  8bedd1fcaeee440ff2560135238a6ea1ad8dc7f9
ChangeLog: Removed remains from former conflict.

flys-client/trunk@5054 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 8bedd1fcaeee -r cccd6183b046 flys-client/ChangeLog
--- 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: