[Koha-bugs] [Bug 26573] Limit patron attribute types to more than one patron category

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

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

Shi Yao Wang <shi-yao.wang at inLibro.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |shi-yao.wang at inLibro.com
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #14 from Shi Yao Wang <shi-yao.wang at inLibro.com> ---
Patch doesn't apply.

Bug 26573 - Limit patron attribute types to more than one patron category

143113 - [DO NOT PUSH] DBIX schema update
144470 - Bug 26573: Limit patron attribute types to more than one patron
category
144471 - Bug 26573: Remove remaining reference to category_code column

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: DBIX schema update
Using index info to reconstruct a base tree...
M       Koha/Schema/Result/Category.pm
M       Koha/Schema/Result/TmpHoldsqueue.pm
Falling back to patching base and 3-way merge...
Auto-merging Koha/Schema/Result/TmpHoldsqueue.pm
CONFLICT (content): Merge conflict in Koha/Schema/Result/TmpHoldsqueue.pm
Auto-merging Koha/Schema/Result/Category.pm
CONFLICT (content): Merge conflict in Koha/Schema/Result/Category.pm
error: Failed to merge in the changes.
Patch failed at 0001 DBIX schema update

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