From 19980c9c06afba09fdf5774b91f69995949f33ad Mon Sep 17 00:00:00 2001 From: Doug Aitken Date: Thu, 27 May 2021 14:09:58 +0100 Subject: [PATCH] fix merge conflict --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 802580e2..9fd16ea0 100644 --- a/README.md +++ b/README.md @@ -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 @@ -570,4 +570,4 @@ Name | Website | Region [YouCanBook.me Ltd](/company-profiles/youcanbook-me.md) | https://youcanbook.me | Worldwide [Zapier](/company-profiles/zapier.md) | https://zapier.com/ | Worldwide [Zeit.io](/company-profiles/zeit-io.md) | https://zeit.io/ | Germany, The Netherlands, Spain, Chile -[Zignaly.com](/company-profiles/zignaly.md) | https://zignaly.io/ | Worldwide \ No newline at end of file +[Zignaly.com](/company-profiles/zignaly.md) | https://zignaly.io/ | Worldwide