https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20554
Dilan Johnpullé <di...@calyx.net.au> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |di...@calyx.net.au --- Comment #21 from Dilan Johnpullé <di...@calyx.net.au> --- I've just run into issues trying to apply this patch too :/ vagrant@kohadevbox:kohaclone(master)$ git bz apply -s 20554 Bug 20554 - New OPAC CSS 77689 - Bug 20554: New OPAC CSS 77690 - Bug 20554: (follow-up) Add local font files and add method for loading them Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 20554: New OPAC CSS Using index info to reconstruct a base tree... M koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc Applying: Bug 20554: (follow-up) Add local font files and add method for loading them Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/about.tt M koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc M koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc Falling back to patching base and 3-way merge... error: The following untracked working tree files would be overwritten by merge: koha-tmpl/opac-tmpl/bootstrap/css/fonts/NotoSans-Bold-webfont.woff koha-tmpl/opac-tmpl/bootstrap/css/fonts/NotoSans-Bold-webfont.woff2 koha-tmpl/opac-tmpl/bootstrap/css/fonts/NotoSans-BoldItalic-webfont.woff koha-tmpl/opac-tmpl/bootstrap/css/fonts/NotoSans-BoldItalic-webfont.woff2 koha-tmpl/opac-tmpl/bootstrap/css/fonts/NotoSans-Italic-webfont.woff koha-tmpl/opac-tmpl/bootstrap/css/fonts/NotoSans-Italic-webfont.woff2 koha-tmpl/opac-tmpl/bootstrap/css/fonts/NotoSans-Regular-webfont.woff koha-tmpl/opac-tmpl/bootstrap/css/fonts/NotoSans-Regular-webfont.woff2 koha-tmpl/opac-tmpl/bootstrap/lib/fontfaceobserver.min.js Please move or remove them before you can merge. Aborting Failed to merge in the changes. Patch failed at 0001 Bug 20554: (follow-up) Add local font files and add method for loading them 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-20554-follow-up-Add-local-font-files-and-add-m-Hfq677.patch -- You are receiving this mail because: 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/