[Koha-bugs] [Bug 8753] Add forgot password link to OPAC

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

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

--- Comment #127 from David Kuhn <techservspec at gmail.com> ---
I get the following error message when I try to install patch:

Some problems occurred applying patches from bug 8753:
<h1>Something went wrong !</h1>Applying: Bug 8753 - Add forgot password link to
OPAC
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
Auto-merging installer/data/mysql/en/mandatory/sample_notices.sql
CONFLICT (content): Merge conflict in
installer/data/mysql/en/mandatory/sample_notices.sql
Failed to merge in the changes.
Patch failed at 0001 Bug 8753 - Add forgot password link to OPAC

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