samdark/Yeeki — pull request #20 by mbryk (2012-03-26 14:28:14+00:00)
Title: Resolve conflict

changes defaultcontroller.php and view.php
sets up a conflict view. this will show how the 2 different revisions are different, and inform the user.