https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23295

Hugo Agud <ha...@orex.es> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |ha...@orex.es
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #2 from Hugo Agud <ha...@orex.es> ---
warning: 3 lines applied after fixing whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
Auto-merging installer/data/mysql/sysprefs.sql
Auto-merging C4/Letters.pm
CONFLICT (content): Merge conflict in C4/Letters.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 23295: Automatically restrict (debar) patrons when
email/sms notices fail
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-23295-Automatically-restrict-debar-patrons-whe-6bIBRK.patch

-- 
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
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/

Reply via email to