https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33260
Emmi Takkinen <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #21 from Emmi Takkinen <[email protected]> --- I'm getting this error when trying to apply the patches: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 33260: Add view_generated_notices user permission Applying: Bug 33260: Add NoticesManagement system preference Applying: Bug 33260: Add a patron getter method to Koha::Notice::Message Applying: Bug 33260: Add Notice management tool Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt M koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt A koha-tmpl/intranet-tmpl/prog/js/patron-autocomplete.js Falling back to patching base and 3-way merge... CONFLICT (modify/delete): koha-tmpl/intranet-tmpl/prog/js/patron-autocomplete.js deleted in HEAD and modified in Bug 33260: Add Notice management tool. Version Bug 33260: Add Notice management tool of koha-tmpl/intranet-tmpl/prog/js/patron-autocomplete.js left in tree. Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 33260: Add Notice management tool hint: Use 'git am --show-current-patch=diff' to see the failed 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-33260-Add-Notice-management-tool-wp4ViP.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/
