From ed8b7019bade15091a72dcd71684c5fc18668e6d Mon Sep 17 00:00:00 2001
From: dadi-frontEnd <108764299+dadi-frontEnd@users.noreply.github.com>
Date: Fri, 15 Dec 2023 14:45:14 +0100
Subject: [PATCH 1/2] add zoom.html
---
.vscode/settings.json | 3 +++
index.html | 28 ++++++++++++++++------------
zoom.html | 14 ++++++++++++++
3 files changed, 33 insertions(+), 12 deletions(-)
create mode 100644 .vscode/settings.json
create mode 100644 zoom.html
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..6f3a291
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+ "liveServer.settings.port": 5501
+}
\ No newline at end of file
diff --git a/index.html b/index.html
index ebcc885..01d678c 100644
--- a/index.html
+++ b/index.html
@@ -1,19 +1,23 @@
-
-
- My Page
-
-
-
-
- YahooTest
-
+
+
+ My Page
+
-Go to page 2
-Go to page 3
+
+
+
+
+ Click Here
+ YahooTest
-
+ Go to page 2
+ Go to page 3
+
+
+
+
\ No newline at end of file
diff --git a/zoom.html b/zoom.html
new file mode 100644
index 0000000..39946d1
--- /dev/null
+++ b/zoom.html
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+ Document
+
+
+
+ Hello I am Your Zoom Student
+
+
+
\ No newline at end of file
From 871bc945e030b0cf046e468f3791c85196337100 Mon Sep 17 00:00:00 2001
From: dadi-frontEnd <108764299+dadi-frontEnd@users.noreply.github.com>
Date: Fri, 15 Dec 2023 15:01:42 +0100
Subject: [PATCH 2/2] Update index.html
---
index.html | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/index.html b/index.html
index 01d678c..ccf879c 100644
--- a/index.html
+++ b/index.html
@@ -9,9 +9,18 @@
+<<<<<<< Updated upstream
Click Here
YahooTest
+=======
+ Click Here
+
+ YahooTest
+
+ Go to page 2
+ Go to page 3
+>>>>>>> Stashed changes
Go to page 2