aboutsummaryrefslogtreecommitdiff
path: root/.bzr-builddeb/default.conf
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-04-01 15:49:14 -0500
committerTed Gould <ted@gould.cx>2010-04-01 15:49:14 -0500
commit70600e1fad7decbd5c1bf98f17a01f05469919f3 (patch)
treec6a37bf96ccd01195fab44f211889297f38bc3f9 /.bzr-builddeb/default.conf
parent4ed0753d96c8fcbebc392516c8238528a799d67d (diff)
downloadlibayatana-appindicator-70600e1fad7decbd5c1bf98f17a01f05469919f3.tar.gz
libayatana-appindicator-70600e1fad7decbd5c1bf98f17a01f05469919f3.tar.bz2
libayatana-appindicator-70600e1fad7decbd5c1bf98f17a01f05469919f3.zip
Disable merge mode
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