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)
debian/compat [new file with mode: 0644]
debian/source/format [new file with mode: 0644]

diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..7f8f011
--- /dev/null
@@ -0,0 +1 @@
+7
diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
@@ -0,0 +1 @@
+3.0 (quilt)