github/github-services — pull request #816 by RedFred7 (2014-03-12 21:28:00+00:00)
Title: Fixed previous merge conflict

set Gemfile.lock to pre-conflict state