[Koha-bugs] [Bug 26697] Make translation file for types and descriptions of charges consistent between OPAC and staff

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

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

Jonathan Druart <jonathan.druart at bugs.koha-community.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Passed QA                   |Patch doesn't apply

--- Comment #16 from Jonathan Druart <jonathan.druart at bugs.koha-community.org> ---
Still not applying.
To prevent such rebases that would be good to have dependencies on bug when
they affect the same file.

CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc

Looks trivial but I'd prefer someone else doing it.

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