# Merge pull request \#90 from SunkenInTime/cloud-ux/sync-status · dara/icarus

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

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

Visibility: public

Requested revision: 33d80c21a86cd7adc53c62a48455a1b7ed7437b5

Requested commit: 33d80c21a86cd7adc53c62a48455a1b7ed7437b5

Commit: 33d80c21a86cd7adc53c62a48455a1b7ed7437b5

Tree: cd4dbc05408357494fa04d6eb915ae2347d307f4

Author: Dara Adedeji

Committer: GitHub

## Message

```
Merge pull request #90 from SunkenInTime/cloud-ux/sync-status

Add persistent cloud sync status chip and surface conflicts
```

## Parents

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

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

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