http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5337
Alexandre Lengereau <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA CC| |alexandre.lengereau@biblibr | |e.com --- Comment #17 from Alexandre Lengereau <[email protected]> --- <h1>Something went wrong !</h1>Applying: Bug 5337: EAN management : Adds ean for various searches<br/> Repository lacks necessary blobs to fall back on 3-way merge.<br/> Cannot fall back to three-way merge.<br/> Patch failed at 0001 Bug 5337: EAN management : Adds ean for various searches<br/> When you have resolved this problem run git am --resolved.<br/> If you would prefer to skip this patch, instead run git am --skip.<br/> To restore the original branch and stop patching run git am --abort.<br/> Bug 5337 - acq EAN search<br/> <br/> proposed patch<br/> Apply? [yn] <br/> Patch left in /tmp/proposed-patch-F6QPRX.patch<br/> <br/>=== translation installation ===<br/>Install templates Install templates 'opac From: /home/koha/src/koha-tmpl/opac-tmpl/prog/en/ To : /home/koha/src/koha-tmpl/opac-tmpl/prog/fr-FR With: /home/koha/src/misc/translator/po/fr-FR-i-opac-t-prog-v-3006000.po The install seems to be successful. Install templates 'intranet From: /home/koha/src/koha-tmpl/intranet-tmpl/prog/en/ To : /home/koha/src/koha-tmpl/intranet-tmpl/prog/fr-FR With: /home/koha/src/misc/translator/po/fr-FR-i-staff-t-prog-v-3006000.po The install seems to be successful. Write opac.pref Write cataloguing.pref Write staff_client.pref Write admin.pref Write serials.pref Write i18n_l10n.pref Write searching.pref Write web_services.pref Write creators.pref Write circulation.pref Write enhanced_content.pref Write authorities.pref Write local_use.pref Write acquisitions.pref Write logs.pref Write patrons.pref -- You are receiving this mail because: You are the QA Contact for the bug. 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/
