Re-add missed conflicts from upstream merge
[debian/pino.git] / debian / compat
1 7