[libreoffice-dictionaries] 04/07: set merge-mode=replace

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice-dictionaries.

commit e8655de77c891311b9dc75a961056149703b1db6
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Oct 5 17:05:29 2017 +0200

    set merge-mode=replace
---
 debian/gbp.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 914d6c9..25a2671 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,5 @@
 [DEFAULT]
 pristine-tar = True
+merge-mode = replace
 [dch]
 id-length = 7

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice-dictionaries.git