koding/global.hackathon — pull request #1274 by rbgapusan (2014-12-06 06:20:20+00:00)
Title: Team CodeMixers PR (updated team details)

Good day!

If this still fails... I'm not sure why there's a merge conflict earlier but is this the right document to follow? https://help.github.com/articles/resolving-a-merge-conflict-from-the-command-line/

I'm the only one editing the files though.