# Merge pull request \#266 from SunkenInTime/t3/lineup-edit-survives-reload · dara/icarus

[View on GitCafe](https://git.cafe/dara/icarus/commit/830f3b41cbd669446f8e5c3aa5ea1631e7fb7625)

Repository: [dara/icarus](https://git.cafe/dara/icarus)

Visibility: public

Requested revision: 830f3b41cbd669446f8e5c3aa5ea1631e7fb7625

Requested commit: 830f3b41cbd669446f8e5c3aa5ea1631e7fb7625

Commit: 830f3b41cbd669446f8e5c3aa5ea1631e7fb7625

Tree: 289e3c0ccf8078413521d345971c1e2d26aa6618

Author: Dara Adedeji

Committer: GitHub

## Message

```
Merge pull request #266 from SunkenInTime/t3/lineup-edit-survives-reload

Resolve cloud conflicts item by item so Edit placement stays open
```

## Parents

- [844ecde612716c612bd4f2021d331f099db0956b](https://git.cafe/dara/icarus/commit/844ecde612716c612bd4f2021d331f099db0956b?format=markdown)

- [b8c3f3026ca7b743d986980a73ca24743a8c3fec](https://git.cafe/dara/icarus/commit/b8c3f3026ca7b743d986980a73ca24743a8c3fec?format=markdown)

[Source at this commit](https://git.cafe/dara/icarus/tree/830f3b41cbd669446f8e5c3aa5ea1631e7fb7625?format=markdown)