adrian/metamorphose
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: adrian:168623337762d8d2b0d4172d1f43df7a267d5d06
Branches Tags
adrian:master
...
compare: adrian:9daea67d7ebf1a8ca3121387101c18221216c6c1
Branches Tags
adrian:master

2 Commits
1686233377 ... 9daea67d7e

Author SHA1 Message Date
Elisa
9daea67d7e Merge branch 'master' of https://git.jean-cloud.net/adrian/metamorphose.git 
Conflicts:
	src/index.html
 2020-05-12 13:25:47 +02:00
Elisa
ef688bd03d Update index.html 2020-05-12 13:21:26 +02:00
1 changed files with 4 additions and 0 deletions
Show Stats Expand all files Collapse all files

4
src/index.html
View File

@ -33,8 +33,12 @@
<section id="contact"> <section id="contact">
<header> <header>
<<<<<<< HEAD
<h2>Contactez nougfffs</h2>
=======
<h2>Contactez nous</h2> <h2>Contactez nous</h2>
</header> </header>
>>>>>>> master
<form action="http://localhost:8080/submit" method="POST"> <form action="http://localhost:8080/submit" method="POST">
<input type="hidden" name="token" value="s0y6WANzU1XnYERoJxMwekP9pqilSVLK5Gbf3hmZadHB2rQ4u8" /> <input type="hidden" name="token" value="s0y6WANzU1XnYERoJxMwekP9pqilSVLK5Gbf3hmZadHB2rQ4u8" />
<div> <div>