Gazler/githug — pull request #121 by snoozbuster (2013-10-25 23:51:54+00:00)
Title: conflict.rb seemed to function incorrectly

The hint for the level implied that the merged file should contain the 'correct' version of the poem and nothing else, but it required the phrase 'cool poem' be in the file. Updated to refuse anything but the 'correct' poem.