[Koha-bugs] [Bug 32607] Add import sources CRUD

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

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

David Nind <david at davidnind.com> changed:

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

--- Comment #34 from David Nind <david at davidnind.com> ---
Patches no longer applies 8-(...

kohadev-koha at kohadevbox:koha(bz32607)$ git bz apply 32607

Bug 32607 - Add import sources CRUD

155682 - Bug 32607: Add table and permissions
155683 - Bug 32607: Add Koha::RecordSource(s) classes
155684 - Bug 32607: DBIC schema [DO NOT PUSH]
155686 - Bug 32607: Add record sources admin page
155958 - Bug 32607: Add /record_sources endpoints

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 32607: Add table and permissions
Applying: Bug 32607: Add Koha::RecordSource(s) classes
Applying: Bug 32607: DBIC schema [DO NOT PUSH]
Using index info to reconstruct a base tree...
M       Koha/Schema/Result/Borrower.pm
Falling back to patching base and 3-way merge...
Auto-merging Koha/Schema/Result/Borrower.pm
CONFLICT (content): Merge conflict in Koha/Schema/Result/Borrower.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 32607: DBIC schema [DO NOT PUSH]

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