diff options
| author | Michael Vogt <mvo@debian.org> | 2015-08-18 11:57:35 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2015-08-18 11:57:35 +0200 |
| commit | b53c9cea2902572822bbbece5bac236c1bbf846e (patch) | |
| tree | 6c6b0524e0971c0623ccbff71383523ee0b2a5cc /debian/gbp.conf | |
| parent | 21248c0f00ee71412dbadc6ebf84011cf974346d (diff) | |
| parent | 2a22cd60f04c4291ea9b9b72e15b6d2ec378b001 (diff) | |
Merge remote-tracking branch 'upstream/debian/experimental' into feature/srv-records
Diffstat (limited to 'debian/gbp.conf')
| -rw-r--r-- | debian/gbp.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/debian/gbp.conf b/debian/gbp.conf index 135522d40..6bad84301 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -4,4 +4,5 @@ postbuild = ./prepare-release post-build debian-branch = debian/experimental debian-tag = %(version)s export-dir = ../build-area -sign-tags = True
\ No newline at end of file +sign-tags = True +multimaint-merge = True |