tree 8f7dd49247a8b1593c9d7c24e038ecd0856de670
parent 31e900ee642e672cec0b7b561c4bb596e1acf9a5
author Robert Newson <rnewson@apache.org> 1306602333 +0000
committer Robert Newson <rnewson@apache.org> 1306602333 +0000

move COUCHDB-1178 test to conflicts.js

git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1128708 13f79535-47bb-0310-9956-ffa450edef68