Katrin Fischer <> changed:

           What    |Removed                     |Added
             Status|Signed Off                  |Patch doesn't apply
                 CC|                            |

--- Comment #23 from Katrin Fischer <> ---
Please rebase!

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 15219: Server-side processing and pagination on checkouts tables
Using index info to reconstruct a base tree...
M       admin/columns_settings.yml
M       installer/data/mysql/sysprefs.sql
M       koha-tmpl/intranet-tmpl/prog/en/includes/
M       koha-tmpl/intranet-tmpl/prog/en/modules/circ/
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/
CONFLICT (content): Merge conflict in
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/
CONFLICT (content): Merge conflict in
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/
Auto-merging installer/data/mysql/sysprefs.sql
Auto-merging admin/columns_settings.yml
Failed to merge in the changes.
Patch failed at 0001 Bug 15219: Server-side processing and pagination on
checkouts tables
The copy of the patch that failed is found in:
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

You are receiving this mail because:
You are watching all bug changes.
Koha-bugs mailing list
website :
git :
bugs :

Reply via email to