http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7249
Chris Cormack <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Patch Status|Needs Signoff |Does not apply --- Comment #2 from Chris Cormack <[email protected]> 2011-11-21 02:54:32 UTC --- Hi Chris, Here's what I get Commit Body is: -------------------------- Starting work on webservices -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Starting work on webservices Commit Body is: -------------------------- Working on caching for services -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Working on caching for services Commit Body is: -------------------------- Added caching to intranet report webservices, added cache expiry and public options to reports -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Added caching to intranet report webservices, added cache expiry and public options to reports fatal: sha1 information is lacking or useless (installer/data/mysql/updatedatabase.pl). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0003 Added caching to intranet report webservices, added cache expiry and public options to reports -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- 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/
