https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35870
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #3 from David Nind <[email protected]> --- The patch no longer applies 8-(... git bz apply 35870 Bug 35870 - Adding an edit_authorities subpermission for editauthorities 161317 - Bug 35870: Adding new subpermission edit_authorities Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 35870: Adding new subpermission edit_authorities Using index info to reconstruct a base tree... M authorities/authorities.pl M installer/data/mysql/mandatory/userpermissions.sql M koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc M koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc M koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt M koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc Auto-merging installer/data/mysql/mandatory/userpermissions.sql Auto-merging authorities/authorities.pl error: Failed to merge in the changes. Patch failed at 0001 Bug 35870: Adding new subpermission edit_authorities -- 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/
