diff options
| author | Ted Gould <ted@gould.cx> | 2010-04-09 11:57:05 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-04-09 11:57:05 -0500 |
| commit | e9392e98b500f47f4eab225108196cd031f0038c (patch) | |
| tree | e0dce6de80a8fdb95377d060f8eff26ec147c5b9 /.bzr-builddeb | |
| parent | 6262d6f411ffdedc114ebca5ffa3f1b527b7c57f (diff) | |
| download | libayatana-indicator-e9392e98b500f47f4eab225108196cd031f0038c.tar.gz libayatana-indicator-e9392e98b500f47f4eab225108196cd031f0038c.tar.bz2 libayatana-indicator-e9392e98b500f47f4eab225108196cd031f0038c.zip | |
No merging
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 |