aboutsummaryrefslogtreecommitdiff
path: root/.bzr-builddeb
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-04-09 11:02:38 -0500
committerTed Gould <ted@gould.cx>2010-04-09 11:02:38 -0500
commitdae6d7d6fda33bf31de4fd7f2a8d76c685f5cdf1 (patch)
treebf2e2f7d3c6fa8c46b1fbeada792889d95fdc79b /.bzr-builddeb
parent8adaef5e5e9b2d8238c0e2f3a7ddcb3a2ba5ad52 (diff)
downloadayatana-indicator-session-dae6d7d6fda33bf31de4fd7f2a8d76c685f5cdf1.tar.gz
ayatana-indicator-session-dae6d7d6fda33bf31de4fd7f2a8d76c685f5cdf1.tar.bz2
ayatana-indicator-session-dae6d7d6fda33bf31de4fd7f2a8d76c685f5cdf1.zip
Turning off merge support for bd
Diffstat (limited to '.bzr-builddeb')
-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