forked from openlp/openlp
hopefully Line ending corrected and resolve merge conflict, part2
This commit is contained in:
parent
2b700c481f
commit
6d7e7d7ad2