From e9392e98b500f47f4eab225108196cd031f0038c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 9 Apr 2010 11:57:05 -0500
Subject: No merging

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

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