[Koha-bugs] [Bug 21852] Add more columns and column configuration to overdues report

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

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

Maryse Simard <maryse.simard at inlibro.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #16 from Maryse Simard <maryse.simard at inlibro.com> ---
Patch doesn't apply

Applying: Bug 21852: Add more columns and column configuration to overdues
report
Using index info to reconstruct a base tree...
M       admin/columns_settings.yml
M       koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
M       koha-tmpl/intranet-tmpl/prog/js/datatables.js
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/js/datatables.js
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/js/datatables.js
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
Auto-merging admin/columns_settings.yml
error: Failed to merge in the changes.
Patch failed at 0001 Bug 21852: Add more columns and column configuration to
overdues report

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