[Koha-bugs] [Bug 5668] Star ratings in the opac

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

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

Paul Poulain <paul.poulain at biblibre.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Passed QA                   |Failed QA

--- Comment #72 from Paul Poulain <paul.poulain at biblibre.com> ---
sorry, there's still a problem:
* many files now have a conflict (just pushed bug 7470, that is probably the
cause)
CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql
CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
CONFLICT (content): Merge conflict in opac/opac-search.pl

I thought they were easy to solve, but seems I can't merge opac-search.pl
easily. After trying, I get a :
syntax error at opac/opac-search.pl line 746, near "elsif"
Missing right curly or square bracket at opac/opac-search.pl line 798, at end
of line


I prefer not doing something wrong, and ask for a rebased patch, really sorry

(Even if I "feature freeze" today, i'll accept this patch if you provide a
rebased version this week)

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