[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

José-Mario Monteiro-Santos <jose-mario.monteiro-santos at inlibro.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |jose-mario.monteiro-santos@
                   |                            |inlibro.com
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #2 from José-Mario Monteiro-Santos <jose-mario.monteiro-santos at inlibro.com> ---
Patch doesn't apply

82550 - Bug 21852: Add more columns and column configuration to overdues report

Apply? [(y)es, (n)o, (i)nteractive] y
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
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
Auto-merging admin/columns_settings.yml
CONFLICT (content): Merge conflict in 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
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in
/tmp/Bug-21852-Add-more-columns-and-column-configuratio-WOKvpz.patch

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