From 2e72405ce9c05d99ea4fa88c82ed06afcfab50d0 Mon Sep 17 00:00:00 2001
From: Seth Falco <seth@elypia.org>
Date: Tue, 2 Feb 2021 23:52:00 +0100
Subject: [PATCH] Fix minor typos.

---
 index.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 023dbc1..eae5f73 100644
--- a/index.html
+++ b/index.html
@@ -416,7 +416,7 @@ <h3><a data-toggle="collapse" data-parent="#accordion" href="#collapse8">Why is
                             easy distribution to our users, as well as regular and fast updates.
                             <a target="_blank" href="http://flatpak.org/">Flatpak</a>
                             would be another alternative but we didn't investigate this yet, nor
-                            are we planing to do so in the near future. However, we're happy to
+                            are we planning to do so in the near future. However, we're happy to
                             accept contributions from the community around Anbox to provide necessary
                             changes to distribute Anbox as a flatpak package too.
                         </p>
@@ -465,7 +465,11 @@ <h2 class="section-heading text-center">Get in touch</h2>
                 </p>
                 <p>
                     You will find all developers on the #anbox IRC channel on the
+<<<<<<< HEAD
                     <a href='https://libera.chat/'>Libera.Chat</a> network or on Telegram
+=======
+                    <a href='https://freenode.net/'>freenode</a> network or on Telegram
+>>>>>>> Fix minor typos.
                     in the <a href="https://t.me/anbox" target="_blank">Anbox</a> group.
                 </p>
                 <p>