http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8753
--- Comment #71 from Marc Véron <[email protected]> --- Does not apply Applying: Bug 8753 - Add forgot password link to OPAC Using index info to reconstruct a base tree... <stdin>:471: trailing whitespace. <stdin>:500: trailing whitespace. ); <stdin>:511: trailing whitespace. } ); <stdin>:25: new blank line at EOF. + <stdin>:126: new blank line at EOF. + warning: squelched 1 whitespace error warning: 6 lines add whitespace errors. Falling back to patching base and 3-way merge... 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/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 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. _______________________________________________ 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/
