https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=22744
Bouzid Fergani <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Signed Off |Patch doesn't apply --- Comment #26 from Bouzid Fergani <[email protected]> --- Hi, Thanks to rebase this patch for testing. Bug 22744 - 'Do not notify' is really a 'Clear' option 92643 - Bug 22744: Rename 'Do no notify' to 'Clear' 92644 - Bug 22774 - (QA follow-up) make "clear" a little more specific 92645 - Bug 22744: Make checkboxes links 92646 - Bug 22744: Name the column clear 92647 - Bug 22744: [alternate] Remove the 'do not notify' buttons Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 22744: Rename 'Do no notify' to 'Clear' Applying: Bug 22774 - (QA follow-up) make "clear" a little more specific Applying: Bug 22744: Make checkboxes links Applying: Bug 22744: Name the column clear Applying: Bug 22744: [alternate] Remove the 'do not notify' buttons Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc error: Failed to merge in the changes. Patch failed at 0001 Bug 22744: [alternate] Remove the 'do not notify' buttons The copy of the patch that failed is found in: .git/rebase-apply/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-22744-alternate-Remove-the-do-not-notify-butto-rf3GDD.patch Bouzid. -- 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/
