From f23e4d4c5835f336e79f203796359075d871c5e6 Mon Sep 17 00:00:00 2001 From: Retekh Date: Wed, 15 Mar 2023 13:42:32 -0500 Subject: [PATCH 1/4] add some html --- index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/index.html b/index.html index a7e6a0d..f9cde0d 100644 --- a/index.html +++ b/index.html @@ -2,6 +2,5 @@

First paragraph

- From 17c658671e219f7ad2b06a8814a32fded26d5d6d Mon Sep 17 00:00:00 2001 From: Retekh Date: Wed, 15 Mar 2023 13:48:38 -0500 Subject: [PATCH 2/4] added another p tag --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index f9cde0d..80eeee5 100644 --- a/index.html +++ b/index.html @@ -2,5 +2,6 @@

First paragraph

+

This is another paragraph

From b3906b712f9a5e7d3fc1db272e62bb6ae833b243 Mon Sep 17 00:00:00 2001 From: Retekh Date: Wed, 15 Mar 2023 16:48:09 -0500 Subject: [PATCH 3/4] almost resolved conflict --- index.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 80eeee5..6c8826d 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,9 @@ -

First paragraph

-

This is another paragraph

+

This is a Heading

> +

first paragraph

+

This is a paragraph

+

This is another paragraph!

From 63f91153e957116fd1eef66545ad0c6b5b14f379 Mon Sep 17 00:00:00 2001 From: Retekh Date: Wed, 15 Mar 2023 16:49:49 -0500 Subject: [PATCH 4/4] almost... --- .vscode/extensions.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .vscode/extensions.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..0270ff2 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,5 @@ +{ + "recommendations": [ + "donjayamanne.githistory" + ] +} \ No newline at end of file