diff --git a/index.html b/index.html index 8c412f3..a1f5d98 100644 --- a/index.html +++ b/index.html @@ -1,11 +1,20 @@ -$ cat index.html - - - -Page Title - - -

first paragraph.

- - - + + + +Page Title + + +<<<<<<< HEAD +

This is a Heading

+

first paragraph.

+

This is a another paragraph

+

This is a paragraph.

+ +======= +

This is a Heading

+

This is a paragraph.

+

This is a another paragraph.

+ +>>>>>>> 6ba97e9 (resolved conflict) + +