filippodb
/
covidpass-greenpass-su-iphone-ios-android-wallet
mirror of https://github.com/covidpass-org/covidpass.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix some oversights

This commit is contained in:
JantsoP 2022-01-10 15:38:55 +02:00
parent 39f8cbf113
commit 5740dba92c
2 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/Page.tsx
View File

@ -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>

22
pages/privacy.tsx
View File

@ -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>