basho/basho_docs — pull request #1420 by TheOnlyRew (2014-11-07 01:07:15+00:00)
Title: Update stale links in the Confilct Resolution/Index page

As the title says, there are currently some stale/typo'd links in this page. This commit fixes everything that I noticed to be broken.