https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35972
--- Comment #4 from Ray Delahunty <[email protected]> --- Wanted to see this in a sandbox, but it appears the patch failed to apply: Bug 35972 - Add a 'Research tables' feature, that builds upon Course reserves 161802 - Bug 35972: Add thesis tables feature 161803 - Bug 35972: Tidy for QA scripts Apply? [(y)es, (n)o, (i)nteractive] Applying: Bug 35972: Add thesis tables feature Using index info to reconstruct a base tree... M C4/CourseReserves.pm M koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc Falling back to patching base and 3-way merge... CONFLICT (add/add): Merge conflict in opac/opac-thesis-tables.pl Auto-merging opac/opac-thesis-tables.pl CONFLICT (add/add): Merge conflict in opac/opac-thesis-table-details.pl Auto-merging opac/opac-thesis-table-details.pl Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc Auto-merging C4/CourseReserves.pm CONFLICT (content): Merge conflict in C4/CourseReserves.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 35972: Add thesis tables feature [33mhint: Use 'git am --show-current-patch=diff' to see the failed patch[m 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-35972-Add-thesis-tables-feature-xerdsj5j.patch -- 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/
