musescore/MuseScore — pull request #990 by Jojo-Schmitz (2014-06-18 20:02:12+00:00)
Title: check for merge conflicts

currently Travis should fail on this, due to 2 such merge conflicts in libmscore/clef.cpp