https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18008
Alex Buckley <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #5 from Alex Buckley <[email protected]> --- Hi Josef When I apply this patch on an up to date clean branch I get the following error: Applying: Bug 18008: Make pagination generated in templates Using index info to reconstruct a base tree... M acqui/neworderbiblio.pl M cataloguing/value_builder/marc21_linking_section.pl M cataloguing/value_builder/unimarc_field_4XX.pl M koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt M koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt M koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt M koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt M koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt M reports/guided_reports.pl M reviews/reviewswaiting.pl M tags/review.pl M virtualshelves/shelves.pl Falling back to patching base and 3-way merge... Auto-merging virtualshelves/shelves.pl Auto-merging tags/review.pl Auto-merging reviews/reviewswaiting.pl CONFLICT (content): Merge conflict in reviews/reviewswaiting.pl Auto-merging reports/guided_reports.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt Auto-merging cataloguing/value_builder/unimarc_field_4XX.pl Auto-merging cataloguing/value_builder/marc21_linking_section.pl Auto-merging acqui/neworderbiblio.pl Failed to merge in the changes. Patch failed at 0001 Bug 18008: Make pagination generated in templates 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-18008-Make-pagination-generated-in-templates-1W76fJ.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
