pouchdb/pouchdb — pull request #3096 by nolanlawson (2014-12-01 21:48:34+00:00)
Title: (#3096) - clarify conflict resolution in docs

I realize I was not giving the correct information here. Also, I was using the word "simply" way too much.