http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7143 Liz Rea <wizzyrea@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |wizzyrea@gmail.com --- Comment #21 from Liz Rea <wizzyrea@gmail.com> 2012-02-07 16:25:46 UTC --- Latest patch does not apply: Commit Body is: -------------------------- Bug 7143 some cleaning * removing useless <strong> everywhere * updating ENSMP => Mines ParisTech * lowering cases -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Bug 7143 some cleaning /home/liz/kohaclone/.git/rebase-apply/patch:102: trailing whitespace. <li>Libriotech, Norway</li> fatal: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/about.tt). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 7143 some cleaning -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.