From dc6901184f166c041620ebb160e0366fdc4de8b3 Mon Sep 17 00:00:00 2001
From: roop <rplawn@icloud.com>
Date: Tue, 21 Jun 2022 18:24:06 -0700
Subject: [PATCH 1/6] first commit

---
 cities.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cities.html b/cities.html
index bab3bfab4..089906ab8 100644
--- a/cities.html
+++ b/cities.html
@@ -26,6 +26,7 @@ <h1>Top cities, by population</h1>
     <li>Istanbul (13,854,740)</li>
     <li>Karachi  (12,991,000)</li>
     <li>Mumbai   (12,478,447)</li>
+    <li>Vancouver   (675,218)</li>
   </ol>
 
 </body>

From 9c50a2d9fbab00651bb4d9551f483a80d1e742d2 Mon Sep 17 00:00:00 2001
From: Carlo Tanjuaquio <carlotanjuaquio@gmail.com>
Date: Wed, 22 Jun 2022 01:24:51 +0000
Subject: [PATCH 2/6] new city

---
 cities.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cities.html b/cities.html
index bab3bfab4..9b117068a 100644
--- a/cities.html
+++ b/cities.html
@@ -26,6 +26,7 @@ <h1>Top cities, by population</h1>
     <li>Istanbul (13,854,740)</li>
     <li>Karachi  (12,991,000)</li>
     <li>Mumbai   (12,478,447)</li>
+    <li>Manila (12,000,000)</li>
   </ol>
 
 </body>

From e72e461ec26b60be64df1bd24e0e4cbdce3f30c9 Mon Sep 17 00:00:00 2001
From: Carmen Tsang <carmtsang89@hotmail.com>
Date: Wed, 22 Jun 2022 01:25:33 +0000
Subject: [PATCH 3/6] add venice to beginning

---
 cities.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cities.html b/cities.html
index bab3bfab4..a85c6e30c 100644
--- a/cities.html
+++ b/cities.html
@@ -22,6 +22,7 @@ <h1>Top cities, by population</h1>
   <hr/>
 
   <ol>
+    <li>Venice (261,905) </li>
     <li>Shanghai (17,836,133)</li>
     <li>Istanbul (13,854,740)</li>
     <li>Karachi  (12,991,000)</li>

From ad7884b4f6f5a2f7f9abeaaeb9cd65e2bb4cde58 Mon Sep 17 00:00:00 2001
From: Carmen Tsang <carmtsang89@hotmail.com>
Date: Wed, 22 Jun 2022 01:33:55 +0000
Subject: [PATCH 4/6] add city

---
 cities.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cities.html b/cities.html
index a85c6e30c..ea578ef7e 100644
--- a/cities.html
+++ b/cities.html
@@ -27,6 +27,7 @@ <h1>Top cities, by population</h1>
     <li>Istanbul (13,854,740)</li>
     <li>Karachi  (12,991,000)</li>
     <li>Mumbai   (12,478,447)</li>
+    <li>Vancouver   (675,218)</li>
   </ol>
 
 </body>

From 02a165364c2501390e8b229ad3d329fb768f6045 Mon Sep 17 00:00:00 2001
From: Carmen Tsang <carmtsang89@hotmail.com>
Date: Wed, 22 Jun 2022 01:38:38 +0000
Subject: [PATCH 5/6] add calgary

---
 cities.html | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/cities.html b/cities.html
index 9a363e7e9..fd5fbcca2 100644
--- a/cities.html
+++ b/cities.html
@@ -27,11 +27,8 @@ <h1>Top cities, by population</h1>
     <li>Istanbul (13,854,740)</li>
     <li>Karachi  (12,991,000)</li>
     <li>Mumbai   (12,478,447)</li>
-<<<<<<< HEAD
     <li>Vancouver   (675,218)</li>
-=======
-    <li>Manila (12,000,000)</li>
->>>>>>> 959df6d937ebb8928c1a0c19b87a6172f0a20645
+    <li>Calgary  (675,218)</li>
   </ol>
 
 </body>

From bb4b757b74cfab0bb644667ba3b43ba8b0e4f7e0 Mon Sep 17 00:00:00 2001
From: roop <rplawn@icloud.com>
Date: Tue, 21 Jun 2022 18:39:34 -0700
Subject: [PATCH 6/6] testing adding yvr again

---
 cities.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cities.html b/cities.html
index fd5fbcca2..d4ea7a7f6 100644
--- a/cities.html
+++ b/cities.html
@@ -28,7 +28,9 @@ <h1>Top cities, by population</h1>
     <li>Karachi  (12,991,000)</li>
     <li>Mumbai   (12,478,447)</li>
     <li>Vancouver   (675,218)</li>
+    <li>Vancouver   (675,218)</li>
     <li>Calgary  (675,218)</li>
+
   </ol>
 
 </body>