https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=36135
--- Comment #80 from Andrew Fuerste-Henry <[email protected]> --- I've just tried to apply these and was also unable. This is on my ktd system, on main, immediately after a git pull. Specifically: Applying: Bug 36135: Add links to the batch modify holds tool Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc error: Failed to merge in the changes. Patch failed at 0001 Bug 36135: Add links to the batch modify holds tool -- 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/
