[Koha-bugs] [Bug 7720] Ambiguity in OPAC Details location.

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

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

Francois Charbonnier <francois.charbonnier at biblibre.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Failed QA
                 CC|                            |francois.charbonnier at biblib
                   |                            |re.com

--- Comment #34 from Francois Charbonnier <francois.charbonnier at biblibre.com> ---
Patch doesn't apply :

Bug 7720 - Ambiguity in OPAC Details location.
Apply? [yn] y

Applying: Bug 7720 - Ambiguity in OPAC Details location.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging C4/Items.pm
Auto-merging installer/data/mysql/sysprefs.sql
CONFLICT (content): Merge conflict in 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/opac-tmpl/prog/en/modules/opac-detail.tt
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
Auto-merging opac/opac-detail.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 7720 - Ambiguity in OPAC Details location.
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".
Patch left in /tmp/Bug-7720---Ambiguity-in-OPAC-Details-location-CmCdA1.patch

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