[Koha-bugs] [Bug 21978] Add middle name field

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

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

Sally <sally.healey at cheshiresharedservices.gov.uk> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #28 from Sally <sally.healey at cheshiresharedservices.gov.uk> ---
Sorry, Martin - patch doesn't apply with the following message:

Applying: Bug 21978: Add support for middle name
.git/rebase-apply/patch:75: trailing whitespace.

.git/rebase-apply/patch:155: trailing whitespace.
    [%- ELSE %] 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
.git/rebase-apply/patch:75: trailing whitespace.

.git/rebase-apply/patch:155: trailing whitespace.
    [%- ELSE %] 
warning: 2 lines applied after fixing whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc
error: Failed to merge in the changes.
Patch failed at 0001 Bug 21978: Add support for middle name

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