aboutsummaryrefslogtreecommitdiff
path: root/.bzr-builddeb/default.conf
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2010-04-09 20:53:31 +0200
committerSebastien Bacher <seb128@ubuntu.com>2010-04-09 20:53:31 +0200
commitec36577978bd7e31c0f52083d5d9d05976edc2db (patch)
tree4e8150197b697ba1f15cd2a59e69d9d2511bfe69 /.bzr-builddeb/default.conf
parent0cf6e6003e546c808968c2a1cd909e10be00a12f (diff)
parent478b7f7a65f1ed01a915d65631c28d82401b7f22 (diff)
downloadlibayatana-indicator-ec36577978bd7e31c0f52083d5d9d05976edc2db.tar.gz
libayatana-indicator-ec36577978bd7e31c0f52083d5d9d05976edc2db.tar.bz2
libayatana-indicator-ec36577978bd7e31c0f52083d5d9d05976edc2db.zip
releasing version 0.3.8-0ubuntu10.3.8-0ubuntu1
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