[Koha-bugs] [Bug 13492] Add location to the checkouts tables

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13492

Aleisha Amohia <aleishaamohia at hotmail.com> changed:

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

--- Comment #4 from Aleisha Amohia <aleishaamohia at hotmail.com> ---
Tried to test but got the following errors when applying patch it depends on
from Bug 10212:

Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
CONFLICT (add/add): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc
CONFLICT (add/add): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc
Auto-merging admin/columns_settings.yml
CONFLICT (add/add): Merge conflict in admin/columns_settings.yml
Auto-merging C4/Utils/DataTables/ColumnsSettings.pm
CONFLICT (add/add): Merge conflict in C4/Utils/DataTables/ColumnsSettings.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 10212: Columns configuration for tables

Setting to Patch doesn't apply

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