From 8b01ab53be37a210794f8525d528695054fb4851 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 10 Dec 2009 11:37:47 -0500 Subject: revert change to .bzr-builddeb/default.conf --- .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 36c28f8..3165e05 100644 --- a/.bzr-builddeb/default.conf +++ b/.bzr-builddeb/default.conf @@ -1,2 +1,2 @@ [BUILDDEB] -merge = False +merge = True -- cgit v1.2.3