[Pkg-bazaar-commits] ./bzr-dbus/unstable r41: Disable merge mode, we don't need it.

[Jelmer Vernooij]

------------------------------------------------------------
revno: 41
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Mon 2008-05-05 17:37:15 +0200
message:
  Disable merge mode, we don't need it.
modified:
  .bzr-builddeb/default.conf
-------------- next part --------------
=== modified file '.bzr-builddeb/default.conf'
--- a/.bzr-builddeb/default.conf	2008-03-04 23:00:45 +0000
+++ b/.bzr-builddeb/default.conf	2008-05-05 15:37:15 +0000
@@ -1,4 +1,3 @@
 [BUILDDEB]
-merge = True
 export-upstream = lp:bzr-dbus
 export-upstream-revision = tag:bzr-dbus-$UPSTREAM_VERSION