https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=36135 --- Comment #81 from Emmi Takkinen <emmi.takkinen@koha-suomi.fi> --- (In reply to Andrew Fuerste-Henry from comment #80)
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
Ah, I see. I'm using git-installation for testing, so I guess it and ktd differ from each other somehow. -- You are receiving this mail because: You are watching all bug changes.