https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=2454
M. Tompsett <mtomp...@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |mtomp...@hotmail.com --- Comment #14 from M. Tompsett <mtomp...@hotmail.com> --- (In reply to Jonathan Druart from comment #13) > CONFLICT (content): Merge conflict in > koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt > > Please do NOT modify the indentation when you do not modify the line or > create a new block. That will avoid this kind of unnecessary rebases. "If you want to reindent large amounts of existing code in connection with a bugfix or enhancement, you must do so in a separate patch from the one with code changes (unless the reindent is required due to the addition or removal of an indentation level (for example, an additional if added around a block)." https://wiki.koha-community.org/wiki/Coding_Guidelines#PERL6:_Indentation -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/