aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2009-12-10 11:37:47 -0500
committerKen VanDine <ken.vandine@canonical.com>2009-12-10 11:37:47 -0500
commit8b01ab53be37a210794f8525d528695054fb4851 (patch)
tree240e712ed123c960b56d6a4f3a0ef3d826c92d6f
parentad1ff9891807b89d3722edaae7de0069aee92bde (diff)
downloadayatana-indicator-session-8b01ab53be37a210794f8525d528695054fb4851.tar.gz
ayatana-indicator-session-8b01ab53be37a210794f8525d528695054fb4851.tar.bz2
ayatana-indicator-session-8b01ab53be37a210794f8525d528695054fb4851.zip
revert change 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 36c28f8..3165e05 100644
--- a/.bzr-builddeb/default.conf
+++ b/.bzr-builddeb/default.conf
@@ -1,2 +1,2 @@
[BUILDDEB]
-merge = False
+merge = True