[Koha-bugs] [Bug 19907] Email validation on patron add/edit not working

[bugzilla-daemon at bugs.koha-community.org]

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

Jon Knight <J.P.Knight at lboro.ac.uk> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |J.P.Knight at lboro.ac.uk

--- Comment #2 from Jon Knight <J.P.Knight at lboro.ac.uk> ---
Tried to apply the patch to an up-to-date kohadevbox but it fails:

vagrant at kohadevbox:kohaclone(master)$ git fetch
vagrant at kohadevbox:kohaclone(master)$ git rebase origin/master
Current branch master is up to date.
vagrant at kohadevbox:kohaclone(master)$ git checkout -b bug_19907
Switched to a new branch 'bug_19907'
vagrant at kohadevbox:kohaclone(bug_19907)$ git bz apply 19907
Bug 19907 - Email validation on patron add/edit not working

70244 - Bug 19907: Fix email validation in patron edit form

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 19907: Fix email validation in patron edit form
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 19907: Fix email validation in patron edit form
The copy of the patch that failed is found in:
   /home/vagrant/kohaclone/.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-19907-Fix-email-validation-in-patron-edit-form-LYJrg8.patch

-- 
You are receiving this mail because:
You are watching all bug changes.