From 70600e1fad7decbd5c1bf98f17a01f05469919f3 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 1 Apr 2010 15:49:14 -0500
Subject: Disable merge mode

---
 .bzr-builddeb/default.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.bzr-builddeb')

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
-- 
cgit v1.2.3