https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=40545
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #11 from David Nind <[email protected]> --- The patches currently don't apply: git bz apply 40545 Bug 40545 - Add a CLI script to manually reset 2FA settings 184850 - Bug 40545: Add has_2fa_enabled and reset_2fa methods to Koha::Patron 184851 - Bug 40545: Add utility script for resetting 2FA settings 184852 - Bug 40545: Add to action logs Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 40545: Add has_2fa_enabled and reset_2fa methods to Koha::Patron Applying: Bug 40545: Add utility script for resetting 2FA settings Applying: Bug 40545: Add to action logs Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/includes/action-logs.inc M koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/action-logs.inc error: Failed to merge in the changes. Patch failed at 0001 Bug 40545: Add to action logs -- 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/
