https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8732 Michael Kuhn <mik@adminkuhn.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |mik@adminkuhn.ch Status|Needs Signoff |Patch doesn't apply --- Comment #22 from Michael Kuhn <mik@adminkuhn.ch> --- Applying: Bug 8732: Allowing biblio level itemtypes to display instead of MARC ones /home/vagrant/kohaclone/.git/rebase-apply/patch:25: trailing whitespace. TrackClicks opacthemes IdRef OpacSuppression /home/vagrant/kohaclone/.git/rebase-apply/patch:115: trailing whitespace. /home/vagrant/kohaclone/.git/rebase-apply/patch:191: trailing whitespace. fatal: sha1 information is lacking or useless (C4/XSLT.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 8732: Allowing biblio level itemtypes to display instead of MARC ones The copy of the patch that failed is found in: /home/vagrant/kohaclone/.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". Patch left in /tmp/Bug-8732-Allowing-biblio-level-itemtypes-to-displa-atzCe7.patch -- You are receiving this mail because: You are watching all bug changes.