[Replicant] [PATCH 2/5] about: Replace CyanogenMod with LineageOS in references, update OmniROM FAQ entry

[Wolfgang Wiedmeyer]

Denis 'GNUtoo' Carikli writes:

> On Thu, 16 Mar 2017 15:50:48 +0100
> Wolfgang Wiedmeyer <wreg at wiedmeyer.de> wrote:
>
> [...]
>> I messed up the LineageOS link here. I fixed this already on my
>> replicant-6.0 branch[1]. I can also send this fix as part of a v2.
>
> It also doesn't apply on top of the 1/5 patch on top of master:
>> $ git am ../patch/\[PATCH\ 2_5\]\ about\:\ Replace\ CyanogenMod\
>> with\ LineageOS\ in\ references\,\ update\ OmniROM\ FAQ\ entry
>> Applying: about: Replace CyanogenMod with LineageOS in references,
>> update OmniROM FAQ entry
>> error: patch failed: about.php:65
>> error: about.php: patch does not apply
>> Patch failed at 0001 about: Replace CyanogenMod with LineageOS in
>> references, update OmniROM FAQ entry
>> The copy of the patch that failed is found in: .git/rebase-apply/patch
>> When you have resolved this problem, run "git am --continue".
>> If you prefer to skip this patch, run "git am --skip" instead.
>> To restore the original branch and stop patching, run "git am
>> --abort".
>
>> $ git log --oneline | head -n2
>> 33bf7c0 header: Link to current folder for home page links
>> 0336250 index: Fix Git commit parsing
>
> Can you resend (now) a patch that can be import.

I sent v2. It applied on top of the 1/5 patch on top of master.

Best regards,
Wolfgang

-- 
Website: https://fossencdi.org
OpenPGP: 0F30 D1A0 2F73 F70A 6FEE  048E 5816 A24C 1075 7FC4
Key download: https://wiedmeyer.de/keys/ww.asc
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/replicant/attachments/20170320/06afcdba/attachment.asc>