mirror of
https://github.com/FoggedLens/iD.git
synced 2026-02-14 17:52:55 +00:00
* use original changeset before conflict resolutions * don't cancel the conflict resolution ui
* use original changeset before conflict resolutions * don't cancel the conflict resolution ui