test_git/fausto at master · le-Lab/test_git · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
<!DOCTYPE html>
<html>

<head>
	<meta charset="utf-8">
	<meta http-equiv="X-UA-Compatible" content="IE=edge">
	<title></title>
	<link rel="stylesheet" href="">
	<style type="text/css">
		body {
			height: 100vh;
			background-color: purple;
		}
	</style>
</head>

<body>
<<<<<<< HEAD
	<p>ok</p>
	<p>BOUJOUR</p>
=======
	<h1>OH YEAAAAHHHHH</h1>
	<p>
		Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor
		in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
	</p>
	<p>Bonjour</p>
	<h2>Je veux la meme coiffure que yjack </h2>
<<<<<<< HEAD
	<p>
		WHEEEEEEEEE
	</p>
=======
<p> looool mdr ptdr xd kikoolol</p>
<span></span>
>>>>>>> ok
</body>

</html>