[Koha-bugs] [Bug 9836] Filtering sort1 list according to patron category in patron data

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9836

cedric.vita at dracenie.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |cedric.vita at dracenie.com

--- Comment #3 from cedric.vita at dracenie.com ---
Something went wrong !
Applying: Bug 9836 Filtering sort1 list according to patron category in patron
data
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 9836 Filtering sort1 list according to patron category
in patron data
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
Bug 9836 - Filtering sort1 list according to patron category in patron data

Bug 9836 Filtering sort1 list according to patron category in patron data
Apply? [yn]
Patch left in
/tmp/Bug-9836-Filtering-sort1-list-according-to-patron--nJMbY9.patch

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