[Koha-bugs] [Bug 22318] Extend Koha news feature to include other content areas

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

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=22318

Michal Denar <black23 at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |black23 at gmail.com

--- Comment #6 from Michal Denar <black23 at gmail.com> ---
Hi,
I tested patches on current master and get this errors:
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: Bug 22318: Example implementation: OpacNavRight system preference
Using index info to reconstruct a base tree...
M       installer/data/mysql/sysprefs.sql
M       koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
M       opac/opac-main.pl
Falling back to patching base and 3-way merge...
Auto-merging opac/opac-main.pl
CONFLICT (content): Merge conflict in opac/opac-main.pl
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
Auto-merging installer/data/mysql/sysprefs.sql
error: Failed to merge in the changes.

Owen, can you rebase patches na master?

Thank you

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