http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5345
Alexandre Lengereau <alexandre.lenger...@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |alexandre.lengereau@biblibr | |e.com --- Comment #26 from Alexandre Lengereau <alexandre.lenger...@biblibre.com> --- <h1>Something went wrong !</h1>Applying: Bug 5345: DataTables integration in acquisition module [1]<br/> Using index info to reconstruct a base tree...<br/> Falling back to patching base and 3-way merge...<br/> Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt<br/> Applying: Bug 5345: DataTables integration in acquisition module [2]<br/> Applying: Bug 5345: DataTables integration in acquisition module [3]<br/> Applying: Bug 5345: DataTables integration in acquisition module [4]<br/> Applying: Bug 5345: DataTables integration in acquisition module [5]<br/> Applying: Bug 5345: DataTables integration in acquisition module [6]<br/> Applying: Bug 5345: DataTables integration in acquisition module [7]<br/> Using index info to reconstruct a base tree...<br/> Falling back to patching base and 3-way merge...<br/> Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt<br/> Applying: Bug 5345: DataTables integration in acquisition module [8]<br/> Applying: Bug 5345: DataTables integration in acquisition module [10]<br/> Applying: Bug 5345: DataTables integration in acquisition module [11]<br/> Applying: Bug 5345: DataTables integration in acquisition module [12]<br/> Using index info to reconstruct a base tree...<br/> Falling back to patching base and 3-way merge...<br/> Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt<br/> CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt<br/> Failed to merge in the changes.<br/> Patch failed at 0001 Bug 5345: DataTables integration in acquisition module [12]<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 5345 - DataTables in Koha<br/> <br/> parcel.tt<br/> Apply? [yn] <br/> acqui-home.tt<br/> Apply? [yn] <br/> addorderiso2709.tt<br/> Apply? [yn] <br/> basket.tt<br/> Apply? [yn] <br/> basketgroup.tt<br/> Apply? [yn] <br/> histsearch.tt<br/> Apply? [yn] <br/> lateorders.tt<br/> Apply? [yn] <br/> neworderbiblio.tt<br/> Apply? [yn] <br/> ordered.tt<br/> Apply? [yn] <br/> orderreceive.tt<br/> Apply? [yn] <br/> parcels.tt<br/> Apply? [yn] <br/> Patch left in /tmp/parcelstt-AYmmg0.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. If you use this system for the 1st time, you may find usefull to reach the wiki page http://wiki.koha-community.org/wiki/Sandboxes to have some information about those results, to check if everything went well & if you can test the patch properly -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/