[Koha-bugs] [Bug 15219] Server-side processing and pagination on checkouts tables
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Mon Apr 16 08:27:56 CEST 2018
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15219
Katrin Fischer <katrin.fischer at bsz-bw.de> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Signed Off |Patch doesn't apply
CC| |katrin.fischer at bsz-bw.de
--- Comment #23 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
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/columns_settings.inc
M
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
M koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
M koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc
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:
/home/vagrant/kohaclone/.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-15219-Server-side-processing-and-pagination-on-niral1.patch
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list