From 4f61dfa83cd13c40c5a0784a0f71b9c008ca0e4d Mon Sep 17 00:00:00 2001 From: ryan ruzani Date: Sat, 25 Mar 2023 19:14:32 +0200 Subject: [PATCH 1/3] added another p tag --- index.html | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/index.html b/index.html index 8c412f3..dd01815 100644 --- a/index.html +++ b/index.html @@ -1,11 +1,11 @@ -$ cat index.html - - - -Page Title - - -

first paragraph.

- - - + + + +Page Title + + +

first paragraph.

+

This is a another paragraph.

+ + + From e6972761328dde18b050026de948b159665a8245 Mon Sep 17 00:00:00 2001 From: ryanruzani <113925293+ryanruzani@users.noreply.github.com> Date: Sat, 25 Mar 2023 19:10:13 +0200 Subject: [PATCH 2/3] Update index.html --- index.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index dd01815..6be5e91 100644 --- a/index.html +++ b/index.html @@ -4,8 +4,10 @@ Page Title +

This is a Heading

first paragraph.

-

This is a another paragraph.

- +

This is a another paragraph

+

This is a paragraph.

+ From b29d2315fd529a7aa6d1c2ac24e3a6e8278f74b0 Mon Sep 17 00:00:00 2001 From: ryan ruzani Date: Sat, 25 Mar 2023 19:22:10 +0200 Subject: [PATCH 3/3] resolved conflict --- index.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/index.html b/index.html index 6be5e91..a1f5d98 100644 --- a/index.html +++ b/index.html @@ -4,10 +4,17 @@ 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)