Compare commits

..

No commits in common. "9daea67d7ebf1a8ca3121387101c18221216c6c1" and "168623337762d8d2b0d4172d1f43df7a267d5d06" have entirely different histories.

View File

@ -33,12 +33,8 @@
<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>