[Koha-bugs] [Bug 9055] Mandumah.com's multiple branch search, multiple branch security mod

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

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

cedric.vita at dracenie.com changed:

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

--- Comment #9 from cedric.vita at dracenie.com ---
Something went wrong !
Applying: Multibranch search, patrons and security mod This mod creates the
ability to search multiple branches using a jquery dropdown, instead of just
one or all branches.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging C4/Auth.pm
Auto-merging C4/Branch.pm
Auto-merging C4/Koha.pm
Auto-merging C4/Members/Attributes.pm
Auto-merging installer/data/mysql/sysprefs.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/admin/preferences/opac.pref
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt
Auto-merging opac/opac-search.pl
CONFLICT (content): Merge conflict in opac/opac-search.pl
Failed to merge in the changes.
Patch failed at 0001 Multibranch search, patrons and security mod This mod
creates the ability to search multiple branches using a jquery dropdown,
instead of just one or all branches.
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 9055 - Mandumah.com's multiple branch search, multiple branch security mod

Multibranch search and security
Apply? [yn]
Patch left in /tmp/Multibranch-search-and-security-i581g9.patch

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