seancribbs/ripple — pull request #291 by tpjg (2012-05-14 22:26:08+00:00)
Title: Gracefully handle conflicts for non-Ripple (riak-client) data

Sorry for another three line pull request. My application is mostly using Ripple, however some data is handled directly using riak-client.
There is no ['_type'] data for documents that are handled with the riak-client only. This small patch allows for conflicting data (allow_mult=true) and resolving it in riak-client only.