[Koha-bugs] [Bug 19709] Move template JavaScript to the footer: Labels

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

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

Claire Gravely <claire_gravely at hotmail.com> changed:

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

--- Comment #2 from Claire Gravely <claire_gravely at hotmail.com> ---
Cannot apply when the process reaches bug 19607 (one of the dependencies)

Applying: Bug 19607: Move admin templates JavaScript to the footer: Basic
parameters
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
Failed to merge in the changes.

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