Re-add missed conflicts from upstream merge debian/0.2.1-1
authorJulien Valroff <julien@kirya.net>
Tue, 9 Mar 2010 17:31:01 +0000 (18:31 +0100)
committerJulien Valroff <julien@kirya.net>
Tue, 9 Mar 2010 17:31:01 +0000 (18:31 +0100)
commit2363788cf7db30ca0230b1b6d4c9138b636d9697
tree9b0416bbe5d93bc6fd6efc902277878ad92adb16
parent2d318b028bb84719f3933f306cc19383fdec4677
Re-add missed conflicts from upstream merge
debian/compat [new file with mode: 0644]
debian/source/format [new file with mode: 0644]