kumu/help — pull request #17 by jeffmohr (2014-04-23 00:24:02+00:00)
Title: Conflict help guide

Added guide for new merge conflict functionality