Don't fail to build when we're on a merge commit.
[dcpomatic.git] / COPYING
2012-07-14 Carl HetheringtonMove things round a bit.