mirror of
https://github.com/FoggedLens/iD.git
synced 2026-04-29 15:16:07 +02:00
ed4929273d
(instead of dispatching `load` event to merge them into `history`) This is cleaner becuase now `context` doesn't need to keep an `altGraph` state used only for Conflict Resolution. The conflict resolution code calls the `iD.Connection` methods directly, and other places in the code call `loadEntity` and `loadTiles` wrappers that merge the entities into the main history.