Mercurial > dive4elements > river
comparison flys-backend/src/main/java/de/intevation/flys/model/Building.java @ 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 | b6f94c5db89e |
| children | 1564ca2cb224 |
comparison
equal
deleted
inserted
replaced
| 3684:3b001c273f1b | 3685:f3686b443d1e |
|---|