basho/basho_docs — pull request #1216 by lucperkins (2014-07-21 19:03:00+00:00)
Title: WIP: Conflict Resolution changes

In light of @russelldb comments [here](https://github.com/basho/riak_ee/issues/265)