424-web-example/Section1.html at master · dominict/424-web-example · GitHub

1
2
3
4
5
6
7
8
9
10
<!DOCTYPE html>
<html>
<!--
What happens when we have conflicts?
by Dominic Thomas
-->
<h1>I deleted the first paragraph!</h1>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam elementum sed sapien vel pulvinar. Sed ut quam in quam accumsan facilisis. Integer eget ante auctor libero maximus finibus. Nulla fermentum fermentum congue. Nunc mi libero, tempor a ornare ac, tristique ac eros. Phasellus lacinia consectetur interdum. Proin felis nisi, fringilla at magna ac, suscipit venenatis tellus.</p>
</body>
</html>