Re-add missed conflicts from upstream merge
[debian/pino.git] / debian / source / format
1 3.0 (quilt)