[Koha-bugs] [Bug 26170] Add protected status for patrons

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

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

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |david at davidnind.com

--- Comment #22 from David Nind <david at davidnind.com> ---
The patch no longer applies 8-(..

git bz apply 26170

Bug 26170 - Add protected status for patrons

154602 - Bug 26170: Database update
154603 - Bug 26170: Add protected status for patrons
154604 - Bug 26170: Update Schema - DO NOT PUSH

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 26170: Database update
Applying: Bug 26170: Add protected status for patrons
Using index info to reconstruct a base tree...
M       C4/Members.pm
M       Koha/Exceptions/Patron.pm
M       Koha/Patron.pm
M       Koha/REST/V1/Patrons.pm
M       api/v1/swagger/paths/patrons.yaml
M       koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
M       t/db_dependent/Koha/Patron.t
M       t/db_dependent/Koha/Patrons.t
M       t/db_dependent/Members.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Members.t
CONFLICT (content): Merge conflict in t/db_dependent/Members.t
Auto-merging t/db_dependent/Koha/Patrons.t
Auto-merging t/db_dependent/Koha/Patron.t
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/members-toolbar.inc
Auto-merging api/v1/swagger/paths/patrons.yaml
Auto-merging Koha/REST/V1/Patrons.pm
Auto-merging Koha/Patron.pm
Auto-merging Koha/Exceptions/Patron.pm
Auto-merging C4/Members.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 26170: Add protected status for patrons

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