* "normal" merge, resolved lots of conflicts

[apt.git] / debian / compat

diff --git a/debian/compat b/debian/compat
index 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f..00750edc07d6415dcc07ae0351e9397b0222b7ba 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-2
+3