Mercurial > hg > gcmultimerge
changeset 88:1d7d4dc5cf68
Remove default dest_name and dest_regex settings.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Tue, 26 Jul 2016 15:56:29 +0300 |
parents | c3f8af496f46 |
children | d68acec7cb99 |
files | multimerge.py |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/multimerge.py Tue Jul 26 15:24:42 2016 +0300 +++ b/multimerge.py Tue Jul 26 15:56:29 2016 +0300 @@ -359,8 +359,8 @@ cfg.mdef("source_regmap", False, cfg.is_list, cfg.trans_list, [1, 2]) cfg.mdef("source_regmap_len", False, None, None, len(cfg.source_regmap)) -cfg.mdef("dest_name", True, cfg.is_string, None, u"Raahen kansainvälisyystoiminta [{0}]") -cfg.mdef("dest_regex", True, cfg.is_string, None, u"^Raahen kansainvälisyystoiminta") +cfg.mdef("dest_name", True, cfg.is_string, None, None) +cfg.mdef("dest_regex", True, cfg.is_string, None, None) cfg.mdef("dest_id", True, cfg.is_string, None, None) cfg.mdef("noauth_local_webserver", False, None, None, True)