mirror of
https://github.com/FoggedLens/iD.git
synced 2026-06-03 13:38:04 +02:00
6638f6806e
* use original changeset before conflict resolutions * don't cancel the conflict resolution ui