Skip to content
This repository has been archived by the owner on Apr 15, 2024. It is now read-only.

Commit

Permalink
README.md: update
Browse files Browse the repository at this point in the history
  • Loading branch information
HerbCaudill committed Jul 21, 2021
1 parent 084ada6 commit 1e95e85
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions README.md
@@ -1,4 +1,4 @@
<img src='img/crdx-logo.png' width='150' />
<img src='https://github.com/HerbCaudill/crdx/blob/master/img/crdx-logo.png' width='150' />

### Multiplayer Redux

Expand All @@ -20,7 +20,7 @@ in a JSON object. When that happens, one of the two values "wins", in an **arbit
way. (See the [Automerge docs](https://github.com/automerge/automerge#conflicting-changes) for more
on how that works.)

<img src='img/crdx-illustration-01.png' width='500' />
<img src='https://github.com/HerbCaudill/crdx/blob/master/img/crdx-illustration-01.png' width='500' />

But what if your definition of a **conflict** is more subtle than just competing values for a single
property? And what if you have your own rules for **conflict resolution**?
Expand Down

0 comments on commit 1e95e85

Please sign in to comment.