https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17378
Cab Vinton <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #6 from Cab Vinton <[email protected]> --- The sandbox you've requested is not ready. Some problems occurred applying patches from bug 17378: <h1>Something went wrong !</h1>Applying: Bug 17378: Add ability to specify maximum number of items per record .git/rebase-apply/patch:159: trailing whitespace. warning: 1 line adds whitespace errors. .git/rebase-apply/patch:159: trailing whitespace. w arning: 1 line adds whitespace errors. e rror: F ailed to merge in the changes. Using index info to reconstruct a base tree... M installer/data/mysql/sysprefs.sql M koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc M koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt M koha-tmpl/intranet-tmpl/prog/js/catalog.js Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/js/catalog.js Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc Auto-merging installer/data/mysql/sysprefs.sql Patch failed at 0001 Bug 17378: Add ability to specify maximum number of items per record 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. Bug 17378 - Add ability to specify maximum number of items per record 75018 - Bug 17378: Add ability to specify maximum number of items per record Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-17378-Add-ability-to-specify-maximum-number-of-9CbVVm.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/
