fix merge conflict

This commit is contained in:
Doug Aitken 2021-05-27 14:09:58 +01:00 committed by GitHub
parent 69973803a9
commit 19980c9c06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -315,7 +315,7 @@ Name | Website | Region
[Lifetime Value Company](/company-profiles/lifetime-value-company.md) | https://www.ltvco.com/ | Worldwide
[Lightbend](/company-profiles/lightbend.md) | https://www.lightbend.com/ | Worldwide
[Linaro](/company-profiles/linaro.md) | https://www.linaro.org/ | Worldwide
[Lincoln Loop](/company-profiles/lincoln-loop.md) ⚠️ | https://lincolnloop.com/ |
[Lincoln Loop](/company-profiles/lincoln-loop.md) | https://lincolnloop.com/ | USA
[LINE Plus Corporation](/company-profiles/line-plus-corporation.md) | https://linepluscorp.com/ | Republic of Korea
[Linux Foundation](/company-profiles/linux-foundation.md) | https://www.linuxfoundation.org/ | Worldwide
[Litmus](/company-profiles/litmus.md) | https://litmus.com/ | Worldwide