Mercurial > dive4elements > river
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 3684:3b001c273f1b | 3685:f3686b443d1e |
|---|---|
| 105 2012-08-27 Ingo Weinzierl <ingo@intevation.de> | 105 2012-08-27 Ingo Weinzierl <ingo@intevation.de> |
| 106 | 106 |
| 107 * doc/documentation/de/importer-hydr-morph.tex: Added documentation from | 107 * doc/documentation/de/importer-hydr-morph.tex: Added documentation from |
| 108 README. | 108 README. |
| 109 | 109 |
| 110 >>>>>>> .r5315 | |
| 111 2012-08-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | 110 2012-08-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> |
| 112 | 111 |
| 113 * doc/README.txt: Documented which hydrological files are taken into account. | 112 * doc/README.txt: Documented which hydrological files are taken into account. |
| 114 | 113 |
| 115 2012-08-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> | 114 2012-08-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> |