aboutsummaryrefslogtreecommitdiff
path: root/.bzr-builddeb/default.conf
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-04-01 10:08:47 -0500
committerTed Gould <ted@gould.cx>2010-04-01 10:08:47 -0500
commit4ec2b26392c033fc3cf9fad1a391de4cd86e05c8 (patch)
treefdd90aea9c9b5cce79025b2167ad1c0a58b6708d /.bzr-builddeb/default.conf
parentb2dcd60537aaadfe25bcd736df206a8a7f976e22 (diff)
downloadayatana-indicator-messages-4ec2b26392c033fc3cf9fad1a391de4cd86e05c8.tar.gz
ayatana-indicator-messages-4ec2b26392c033fc3cf9fad1a391de4cd86e05c8.tar.bz2
ayatana-indicator-messages-4ec2b26392c033fc3cf9fad1a391de4cd86e05c8.zip
Setting merge mode to false
Diffstat (limited to '.bzr-builddeb/default.conf')
-rw-r--r--.bzr-builddeb/default.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
index 3165e05..36c28f8 100644
--- a/.bzr-builddeb/default.conf
+++ b/.bzr-builddeb/default.conf
@@ -1,2 +1,2 @@
[BUILDDEB]
-merge = True
+merge = False