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} 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 {
{t('privacy:contact')}
-<<<<<<< HEAD
Jantso Porali
Rakentajanpolku 3H
96960 Rovaniemi
{t('privacy:email')}:
jantso.porali@gmail.com
-=======
- Marvin Sextro
-
- {t('privacy:email')}:
-
- covidpass@marvinsextro.de
->>>>>>> 68387b1eaef1fe256d04b3c888afb61967115ccf
{t('privacy:process')}
@@ -140,16 +132,6 @@ function Privacy(): JSX.Element {