[Koha-bugs] [Bug 7674] Separate tabs for my holdings and others holdings

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

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

--- Comment #10 from delaye <stephane.delaye at biblibre.com> ---
i have this message when i want to test in a sandbox

omething went wrong !
Applying: Bug 7674: Separate items in two tabs on biblio detail page
(staff+opac)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging installer/data/mysql/sysprefs.sql
CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql
Auto-merging installer/data/mysql/updatedatabase.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 7674: Separate items in two tabs on biblio detail page
(staff+opac)
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 7674 - Separate tabs for my holdings and others holdings

Bug 7674: Separate items in two tabs on biblio detail page (staff+opac)
Apply? [yn]
Patch left in
/tmp/Bug-7674-Separate-items-in-two-tabs-on-biblio-deta-iPrfAr.patch

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