[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

--- Comment #12 from jmbroust <jean-manuel.broust at univ-lyon2.fr> ---
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 admin/authorised_values.pl
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
Auto-merging members/memberentry.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

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