SCMEval/qua-example — pull request #5 by jarsenx (2014-01-13 17:47:58+00:00)
Title: Another exciting pull request

Conflict resolution example