http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7143

Liz Rea <[email protected]> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |[email protected]

--- Comment #21 from Liz Rea <[email protected]> 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.
_______________________________________________
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/

Reply via email to