[Pkg-bazaar-commits] ./bzr-git/unstable r28: Remove merge.

[Jelmer Vernooij]

------------------------------------------------------------
revno: 28
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Fri 2008-08-22 19:44:08 +0200
message:
  Remove merge.
modified:
  .bzr-builddeb/default.conf
-------------- next part --------------
=== modified file '.bzr-builddeb/default.conf'
--- a/.bzr-builddeb/default.conf	2007-12-06 14:56:44 +0000
+++ b/.bzr-builddeb/default.conf	2008-08-22 17:44:08 +0000
@@ -1,4 +1,3 @@
 [BUILDDEB]
-merge = True
 export-upstream = lp:bzr-git
 export-upstream-revision = tag:bzr-git-$UPSTREAM_VERSION