diff options
author | Ted Gould <ted@gould.cx> | 2010-04-01 09:05:18 -0500 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2010-04-01 09:05:18 -0500 |
commit | ed62aa80eb9b365da5967b0cd530213083db5d92 (patch) | |
tree | 54dcbd60b27550ac098becc9e54c89c5b7c3322c /.bzr-builddeb | |
parent | 65bd97a9dfb54716be7797923773e1ad7a33a67c (diff) | |
download | libdbusmenu-ed62aa80eb9b365da5967b0cd530213083db5d92.tar.gz libdbusmenu-ed62aa80eb9b365da5967b0cd530213083db5d92.tar.bz2 libdbusmenu-ed62aa80eb9b365da5967b0cd530213083db5d92.zip |
Turning off merge mode
Diffstat (limited to '.bzr-builddeb')
-rw-r--r-- | .bzr-builddeb/default.conf | 2 |
1 files changed, 1 insertions, 1 deletions
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 |