aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2009-12-10 15:02:25 -0500
committerKen VanDine <ken.vandine@canonical.com>2009-12-10 15:02:25 -0500
commit87560be1a0354282e00c621a4a9cdc1114e47ea1 (patch)
tree32bbf095bb348aae285cff6af50791f7db0d20e6
parentfb2b3cf858bcae1ec284472c33e9d4d1cb2bda6d (diff)
downloadayatana-indicator-application-87560be1a0354282e00c621a4a9cdc1114e47ea1.tar.gz
ayatana-indicator-application-87560be1a0354282e00c621a4a9cdc1114e47ea1.tar.bz2
ayatana-indicator-application-87560be1a0354282e00c621a4a9cdc1114e47ea1.zip
added bzr-builddeb/default.conf
-rw-r--r--.bzr-builddeb/default.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
new file mode 100644
index 0000000..3165e05
--- /dev/null
+++ b/.bzr-builddeb/default.conf
@@ -0,0 +1,2 @@
+[BUILDDEB]
+merge = True