diff flys-backend/ChangeLog @ 3685:f3686b443d1e

Removed conflict markers from ChangeLog. flys-backend/trunk@5317 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Thu, 30 Aug 2012 13:19:13 +0000
parents 3b001c273f1b
children c959444ff395
line wrap: on
line diff
--- 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.

http://dive4elements.wald.intevation.org