https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=22318
Michal Denar <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #6 from Michal Denar <[email protected]> --- 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. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
