From cb63675d26c11189805eb9174bd54d236f717c0a Mon Sep 17 00:00:00 2001 From: Robert Ochieng Date: Thu, 7 Apr 2022 10:28:50 +0300 Subject: [PATCH 1/4] add some html --- index.html | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/index.html b/index.html index 2828ac9..b91072d 100644 --- a/index.html +++ b/index.html @@ -1,12 +1,9 @@ - - - -Page Title - - - - -

First paragraph.

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

First paragraph.

+ + From 7ebc48f5bee5f267dd1e20f35f4076c13d5a6409 Mon Sep 17 00:00:00 2001 From: OdenyoR <74651100+OdenyoR@users.noreply.github.com> Date: Thu, 7 Apr 2022 10:32:49 +0300 Subject: [PATCH 2/4] Update index.html --- index.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/index.html b/index.html index b91072d..d239677 100644 --- a/index.html +++ b/index.html @@ -4,6 +4,13 @@ Page Title +<<<<<<< HEAD

First paragraph.

+======= + +

This is a Heading

+

This is a paragraph.

+ +>>>>>>> c85ea2c (Update index.html) From 6974d20df25396253044c0c519902c42a544f337 Mon Sep 17 00:00:00 2001 From: Robert Ochieng Date: Thu, 7 Apr 2022 11:07:34 +0300 Subject: [PATCH 3/4] resolved conflict --- index.html | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/index.html b/index.html index d239677..9002aa3 100644 --- a/index.html +++ b/index.html @@ -4,13 +4,7 @@ Page Title -<<<<<<< HEAD

First paragraph.

-======= - -

This is a Heading

-

This is a paragraph.

- ->>>>>>> c85ea2c (Update index.html) +

This is another paragraph

From 667592468eb08c8fa6ef4b2fe86322516e49b120 Mon Sep 17 00:00:00 2001 From: Robert Ochieng Date: Fri, 8 Apr 2022 07:08:10 +0300 Subject: [PATCH 4/4] added Github --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index 4cf4182..942c9c2 100644 --- a/index.js +++ b/index.js @@ -1 +1 @@ -console.log("Hello git"); +console.log("Hello git and Github");