Remove conflicts
authorIceyer <me@iceyer.net>
Fri, 28 Jul 2017 03:33:07 +0000 (11:33 +0800)
committerIceyer <me@iceyer.net>
Fri, 28 Jul 2017 03:33:07 +0000 (11:33 +0800)
commit8c82c23f5241971c5283476f71656ec979865bd5
tree573ac4e40ef5ff8d329521d202c09b2e83b4e558
parent84d0c1ea161dd0d9981aef90b3bc8a89048aefc0
Remove conflicts

Change-Id: I790d41822d4741c71295acbf04db73616bd3dc8b
debian/control
debian/libdtkcore-dev.install