conflictdemo2/index.html at master · gregaubs/conflictdemo2 · 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
<!DOCTYPE html>
<html>

<head>
</head>


<body>

	<h1>  Demo Merge Conflicts  </h1>


<p>
  Greg  and Amil  asdlfsdddfsd
</p>

<p> Amil Amil   GREG </p>

<p>
	askfjsdfklsajklfdjfklsdjfsdlkjsdfklsdjklsjadklfjklasdjfklasdfjsdklfjdklafjdklfsadjfklsdjksldj 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>sssadfdf
</p>


</body>


</html>