https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15685
delaye <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] | |m Status|Needs Signoff |Patch doesn't apply --- Comment #8 from delaye <[email protected]> --- The sandbox you've requested is not ready. Some problems occurred applying patches from bug 15685: <h1>Something went wrong !</h1>Applying: Bug 15685: Allow creation of items (AcqCreateItem) to be customizable per-basket .git/rebase-apply/patch:603: trailing whitespace. .git/rebase-apply/patch:668: trailing whitespace. w arning: 2 lines add whitespace errors. Using index info to reconstruct a base tree... M C4/Acquisition.pm M acqui/addorder.pl M acqui/addorderiso2709.pl M acqui/basket.pl M acqui/basketheader.pl M acqui/neworderempty.pl M acqui/orderreceive.pl M installer/data/mysql/kohastructure.sql M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt M opac/opac-detail.pl .git/rebase-apply/patch:603: trailing whitespace. .git/rebase-apply/patch:668: trailing whitespace. w arning: 2 lines add whitespace errors. Falling back to patching base and 3-way merge... Auto-merging opac/opac-detail.pl CONFLICT (content): Merge conflict in opac/opac-detail.pl Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt Auto-merging installer/data/mysql/kohastructure.sql Auto-merging acqui/orderreceive.pl Auto-merging acqui/neworderempty.pl Auto-merging acqui/basketheader.pl Auto-merging acqui/basket.pl Auto-merging acqui/addorderiso2709.pl Auto-merging acqui/addorder.pl Auto-merging C4/Acquisition.pm Patch failed at 0001 Bug 15685: Allow creation of items (AcqCreateItem) to be customizable per-basket The copy of the patch that failed is found in: .git/rebase-apply/patch 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. error: Failed to merge in the changes. Bug 15685 - Allow creation of items (AcqCreateItem) to be customizable per-basket 55096 - Bug 15685: Allow creation of items (AcqCreateItem) to be customizable per-basket Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-15685-Allow-creation-of-items-AcqCreateItem-to-2qN6Q0.patch . -- 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/
