[Koha-bugs] [Bug 15395] Allow correct handling of plural translation

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15395

Bernardo Gonzalez Kriegel <bgkriegel at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |bgkriegel at gmail.com

--- Comment #5 from Bernardo Gonzalez Kriegel <bgkriegel at gmail.com> ---
Applying: Bug 15395: Example usage of I18N Template::Toolkit plugin
Using index info to reconstruct a base tree...
M       C4/Search.pm
M       koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt

-- 
You are receiving this mail because:
You are watching all bug changes.