https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8628
[email protected] changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #114 from [email protected] --- Bug 8628 - Add digital signs to the OPAC 118472 - Bug 8628: Digital signs - db changes 118473 - Bug 8628: Digital signs - Koha objects 118474 - Bug 8628: Digital signs - preferences and permissions 118475 - Bug 8628: Digital signs - staff interface 118476 - Bug 8628: Digital signs - opac interface 118477 - Bug 8628: (follow-up) Use utf8mb4 and TableExists in atomic update 118478 - Bug 8628: (follow-up) Fixes for qa tools 119455 - Bug 8628: (follow-up) Fix layout of signs admin page 131223 - Bug 8628: Updated schema files 131224 - Bug 8628: (follow-up) Fix documentation, subroutine calls, filters Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 8628: Digital signs - db changes Applying: Bug 8628: Digital signs - Koha objects Applying: Bug 8628: Digital signs - preferences and permissions Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc error: Failed to merge in the changes. Patch failed at 0001 Bug 8628: Digital signs - preferences and permissions 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-8628-Digital-signs---preferences-and-permissio-n3pr1S.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/
