diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-13 14:20:05 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-13 14:20:05 +0000 |
| commit | 8c652a2b5f4ed07abd682543ad6a365c6d50b8d3 (patch) | |
| tree | b6913b1d6ca63e2159ea2515e11f024fa4b056ca /synapse/util/stringutils.py | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-8c652a2b5f4ed07abd682543ad6a365c6d50b8d3.tar.xz | |
When we see a difference in current state, actually use state conflict resolution algorithm
Diffstat (limited to 'synapse/util/stringutils.py')
0 files changed, 0 insertions, 0 deletions