lilia 3e73f8f0ba Resolve conflicts in series ...

Attempting to resolve outgoing conflicts in parallel triggers multiple
requests for new keys from the server and causes it to return a 500
error.

2015-08-03 11:02:54 -07:00

12 KiB

Raw Blame History

View Raw