Hi, Rolf Bode-Meyer wrote: > On updating the data in an edited area I'm told there where conflicts > and I get a relation listed in the Conflict panel. On clicking resolve > a dialogue pops up but it doesn't show data in either of the three > lists. Clicking resolve closes the dialogue, the entry in the panel is > removed but on updating the data or uploading I get the error again.
I fixed some conflict resolution bugs in version 1561 and tested basic conflict resolution afterwards and found it to work; if you can describe how to reproduce the above problem that would be great. Bye Frederik -- Frederik Ramm ## eMail frede...@remote.org ## N49°00'09" E008°23'33" _______________________________________________ josm-dev mailing list josm-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/josm-dev