@@ -, +, @@ page + resolve a git merge conflict => A warning should appear in the "Guarantees" section with the total due --- .../prog/en/modules/members/moremember.tt | 54 +++++++++++++++++-- members/moremember.pl | 5 ++ 2 files changed, 54 insertions(+), 5 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -212,6 +212,13 @@
  • Guarantees: