# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1346332753 0
# Node ID f3686b443d1e646eeca2bd7c4388366c66bf7711
# Parent  3b001c273f1b8a1a7e051e75298825d2c57cb19d
Removed conflict markers from ChangeLog.

flys-backend/trunk@5317 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 3b001c273f1b -r f3686b443d1e flys-backend/ChangeLog
--- a/flys-backend/ChangeLog	Thu Aug 30 13:15:16 2012 +0000
+++ b/flys-backend/ChangeLog	Thu Aug 30 13:19:13 2012 +0000
@@ -107,7 +107,6 @@
 	* doc/documentation/de/importer-hydr-morph.tex: Added documentation from
 	  README.
 
->>>>>>> .r5315
 2012-08-27	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	* doc/README.txt: Documented which hydrological files are taken into account.