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