diff options
| author | Ted Gould <ted@gould.cx> | 2010-04-01 15:49:14 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-04-01 15:49:14 -0500 |
| commit | 70600e1fad7decbd5c1bf98f17a01f05469919f3 (patch) | |
| tree | c6a37bf96ccd01195fab44f211889297f38bc3f9 | |
| parent | 4ed0753d96c8fcbebc392516c8238528a799d67d (diff) | |
| download | ayatana-indicator-application-70600e1fad7decbd5c1bf98f17a01f05469919f3.tar.gz ayatana-indicator-application-70600e1fad7decbd5c1bf98f17a01f05469919f3.tar.bz2 ayatana-indicator-application-70600e1fad7decbd5c1bf98f17a01f05469919f3.zip | |
Disable merge mode
| -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 |