From 5740dba92cfd3437a94d914a3db12aee3d6a79a6 Mon Sep 17 00:00:00 2001
From: JantsoP <jantso.porali@gmail.com>
Date: Mon, 10 Jan 2022 15:38:55 +0200
Subject: [PATCH] Fix some oversights

---
 components/Page.tsx |  5 -----
 pages/privacy.tsx   | 22 ----------------------
 2 files changed, 27 deletions(-)

diff --git a/components/Page.tsx b/components/Page.tsx
index 7548191..8ea24d4 100644
--- a/components/Page.tsx
+++ b/components/Page.tsx
@@ -24,13 +24,8 @@ function Page(props: PageProps): JSX.Element {
                     {props.content}
 
                     <footer>
-<<<<<<< HEAD
                         <nav className="nav flex pt-4 flex-row space-x-4 justify-center text-md font-bold flex-wrap">
                             <a href="https://github.com/jantsop/covidpass" className="hover:underline">{t('common:gitHub')}</a>
-=======
-                        <nav className="nav flex flex-row space-x-4 justify-center text-md font-bold flex-wrap">
-                            <a href="https://github.com/marvinsxtr/covidpass" className="hover:underline">{t('common:gitHub')}</a>
->>>>>>> 68387b1eaef1fe256d04b3c888afb61967115ccf
                             <Link href="/privacy"><a className="hover:underline">{t('common:privacyPolicy')}</a></Link>
                         </nav>
                     </footer>
diff --git a/pages/privacy.tsx b/pages/privacy.tsx
index 83bf162..4bc3d20 100644
--- a/pages/privacy.tsx
+++ b/pages/privacy.tsx
@@ -49,20 +49,12 @@ function Privacy(): JSX.Element {
                     </div>
                     <p className="font-bold">{t('privacy:contact')}</p>
                     <p>
-<<<<<<< HEAD
                         Jantso Porali<br/>
                         Rakentajanpolku 3H<br/>
                         96960 Rovaniemi<br/>
                         {t('privacy:email')}:
                         &nbsp;
                         <a href="mailto:jantso.porali@gmail.com">jantso.porali@gmail.com</a>
-=======
-                        Marvin Sextro
-                        <br/>
-                        {t('privacy:email')}:
-                        &nbsp;
-                        <a href="mailto:covidpass@marvinsextro.de" className="underline">covidpass@marvinsextro.de</a>
->>>>>>> 68387b1eaef1fe256d04b3c888afb61967115ccf
                         <br/>
                     </p>
                     <p className="font-bold">{t('privacy:process')}</p>
@@ -140,16 +132,6 @@ function Privacy(): JSX.Element {
                                 </a>
                             </li>
                             <li>
-<<<<<<< HEAD
-=======
-                                Ko-fi:
-                                &nbsp;
-                                <a href="https://more.ko-fi.com/privacy" className="underline">
-                                    {t('common:privacyPolicy')}
-                                </a>
-                            </li>
-                            <li>
->>>>>>> 68387b1eaef1fe256d04b3c888afb61967115ccf
                                 Gmail/Google:
                                 &nbsp;
                                 <a href="https://policies.google.com/privacy?hl=fi-FI" className="underline">
@@ -159,11 +141,7 @@ function Privacy(): JSX.Element {
                             <li>
                                 {t('privacy:appleSync')}:
                                 &nbsp;
-<<<<<<< HEAD
                                 <a href="https://www.apple.com/fi/legal/privacy/fi/" className="underline">
-=======
-                                <a href="https://www.apple.com/legal/privacy/en-ww/" className="underline">
->>>>>>> 68387b1eaef1fe256d04b3c888afb61967115ccf
                                     {t('common:privacyPolicy')}
                                 </a>
                             </li>