[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

Jason Burds <jburds at dubuque.lib.ia.us> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Failed QA
                 CC|                            |jburds at dubuque.lib.ia.us

--- Comment #78 from Jason Burds <jburds at dubuque.lib.ia.us> ---
The sandbox you've requested is not ready.
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/includes/masthead.inc
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/sysprefs.sql Auto-merging
installer/data/mysql/kohastructure.sql
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

When you have resolved this problem run git bz apply --continue.
If you would prefer to skip this patch, instead run git bz apply --skip.
To restore the original branch and stop patching run git bz apply --abort.
Bug 8753 - Add forgot password link to OPAC

36819 - Bug 8753 - Add forgot password link to OPAC

Apply? [(y)es, (n)o, (i)nteractive] Patch left in
/tmp/Bug-8753---Add-forgot-password-link-to-OPAC-VCLXC4.patch .

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