https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39567
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #23 from David Nind <[email protected]> --- The patches no longer apply for me 8-(... git bz apply 39567 Bug 39567 - Move form-submit js into js includes files 180986 - Bug 39567: Include form-submit code from js_includes.inc (staff interface) 180987 - Bug 39567: Include form-submit code from opac-bottom.inc (OPAC) 180988 - Bug 39567: Remove form-submit includes from tt files 181235 - Bug 39567: Run JS change in separate file ESM as per JS1 Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 39567: Include form-submit code from js_includes.inc (staff interface) Applying: Bug 39567: Include form-submit code from opac-bottom.inc (OPAC) Applying: Bug 39567: Remove form-submit includes from tt files Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt M koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt M koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt M koha-tmpl/intranet-tmpl/prog/en/modules/admin/ill_batch_statuses.tt M koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt M koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt M koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt M koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt M koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt M koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt M koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt M koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/ill_batch_statuses.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 39567: Remove form-submit includes from tt files -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://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/
