From e86ecfad46e1d809764a6b26fe114c21ab3e3c6d Mon Sep 17 00:00:00 2001 From: Tyree Webber Date: Fri, 1 Jul 2022 13:49:41 -0600 Subject: [PATCH 01/10] add Edmonton to end of ordered list --- cities.html | 1 + 1 file changed, 1 insertion(+) diff --git a/cities.html b/cities.html index bab3bfab4..487d89b57 100644 --- a/cities.html +++ b/cities.html @@ -26,6 +26,7 @@

Top cities, by population

  • Istanbul (13,854,740)
  • Karachi (12,991,000)
  • Mumbai (12,478,447)
    • +
  • Edmonton (1,519,000)
    • From 55db0ce174e333d367808ea5f9d5628c689d67d2 Mon Sep 17 00:00:00 2001 From: Jesse Kopala Date: Fri, 1 Jul 2022 13:52:51 -0600 Subject: [PATCH 02/10] Add Calgary to top of the list --- cities.html | 1 + 1 file changed, 1 insertion(+) diff --git a/cities.html b/cities.html index bab3bfab4..708eaa7b3 100644 --- a/cities.html +++ b/cities.html @@ -22,6 +22,7 @@

    Top cities, by population

      +
    1. Calgary (1,306,784)
    2. Shanghai (17,836,133)
    3. Istanbul (13,854,740)
    4. Karachi (12,991,000)
      5. From bcaaff4937d9919bec882611117873a11c496802 Mon Sep 17 00:00:00 2001 From: AVacAdok Date: Fri, 1 Jul 2022 20:01:29 +0000 Subject: [PATCH 03/10] add city name --- cities.html | 1 + 1 file changed, 1 insertion(+) diff --git a/cities.html b/cities.html index 4ba15be8b..aab0fee29 100644 --- a/cities.html +++ b/cities.html @@ -22,6 +22,7 @@

      Top cities, by population

        +
      1. Vancouver
      2. Calgary (1,306,784)
      3. Shanghai (17,836,133)
      4. Istanbul (13,854,740)
        5. From bb6756e8f3585f746c0c6ba7a0077f24e2141f2b Mon Sep 17 00:00:00 2001 From: Jesse Kopala Date: Fri, 1 Jul 2022 14:04:07 -0600 Subject: [PATCH 04/10] Add Toronto to list --- cities.html | 1 + 1 file changed, 1 insertion(+) diff --git a/cities.html b/cities.html index 4ba15be8b..f3ed852dc 100644 --- a/cities.html +++ b/cities.html @@ -23,6 +23,7 @@

        Top cities, by population

        1. Calgary (1,306,784)
          2. +
        2. Toronto (5,000,000)
        3. Shanghai (17,836,133)
        4. Istanbul (13,854,740)
        5. Karachi (12,991,000)
          6. From 76e6c9aa535d6a4ea19c214643ec30da85008777 Mon Sep 17 00:00:00 2001 From: Tyree Webber Date: Fri, 1 Jul 2022 14:07:28 -0600 Subject: [PATCH 05/10] add Berlin to end of cities --- cities.html | 1 + 1 file changed, 1 insertion(+) diff --git a/cities.html b/cities.html index d7e1380d4..eb2fc91ac 100644 --- a/cities.html +++ b/cities.html @@ -30,6 +30,7 @@

          Top cities, by population

        6. Karachi (12,991,000)
        7. Mumbai (12,478,447)
        8. Edmonton (1,519,000)
          9. +
        9. Berlin (3,571,000)
        From eefa4335e86aff609961e0635bf5d756bbf3251b Mon Sep 17 00:00:00 2001 From: Jesse Kopala Date: Fri, 1 Jul 2022 14:08:15 -0600 Subject: [PATCH 06/10] Add halifax to end of list --- cities.html | 1 + 1 file changed, 1 insertion(+) diff --git a/cities.html b/cities.html index d7e1380d4..1a6cfa281 100644 --- a/cities.html +++ b/cities.html @@ -30,6 +30,7 @@

        Top cities, by population

      5. Karachi (12,991,000)
      6. Mumbai (12,478,447)
      7. Edmonton (1,519,000)
        8. +
      8. Halifax (?????????)
      From 5c4ffa0e313c46d2177f65cecc36168d275aefce Mon Sep 17 00:00:00 2001 From: AVacAdok Date: Fri, 1 Jul 2022 20:08:48 +0000 Subject: [PATCH 07/10] add city name --- cities.html | 1 + 1 file changed, 1 insertion(+) diff --git a/cities.html b/cities.html index d7e1380d4..0dda910e8 100644 --- a/cities.html +++ b/cities.html @@ -30,6 +30,7 @@

      Top cities, by population

    5. Karachi (12,991,000)
    6. Mumbai (12,478,447)
    7. Edmonton (1,519,000)
      8. +
    8. HongKong (14,123,456)
    From 7747edfc044917d96165caf3a95b19fcc0306223 Mon Sep 17 00:00:00 2001 From: Tyree Webber Date: Fri, 1 Jul 2022 14:22:30 -0600 Subject: [PATCH 08/10] remove 'nastiness' --- cities.html | 9 --------- 1 file changed, 9 deletions(-) diff --git a/cities.html b/cities.html index f0e197039..f97200133 100644 --- a/cities.html +++ b/cities.html @@ -22,23 +22,14 @@

    Top cities, by population

      -
    1. Vancouver
      2. -
    2. Calgary (1,306,784)
      3. -
    3. Toronto (5,000,000)
    4. Shanghai (17,836,133)
    5. Istanbul (13,854,740)
    6. Karachi (12,991,000)
    7. Mumbai (12,478,447)
    8. Edmonton (1,519,000)
      9. -<<<<<<< HEAD -<<<<<<< HEAD
    9. Halifax (?????????)
      10. -=======
    10. Berlin (3,571,000)
      11. ->>>>>>> 76e6c9aa535d6a4ea19c214643ec30da85008777 -=======
    11. HongKong (14,123,456)
      12. ->>>>>>> aa7fd13df3d247345c29225be28427161e1fc1d1
    From 238ca08775f9309b9f297406fd2150509db7728d Mon Sep 17 00:00:00 2001 From: Jesse Kopala Date: Fri, 1 Jul 2022 14:24:02 -0600 Subject: [PATCH 09/10] commit list changes --- cities.html | 7 ------- 1 file changed, 7 deletions(-) diff --git a/cities.html b/cities.html index f0e197039..29403fa77 100644 --- a/cities.html +++ b/cities.html @@ -30,15 +30,8 @@

    Top cities, by population

  • Karachi (12,991,000)
  • Mumbai (12,478,447)
  • Edmonton (1,519,000)
    • -<<<<<<< HEAD -<<<<<<< HEAD
  • Halifax (?????????)
    • -=======
  • Berlin (3,571,000)
    • ->>>>>>> 76e6c9aa535d6a4ea19c214643ec30da85008777 -======= -
  • HongKong (14,123,456)
    • ->>>>>>> aa7fd13df3d247345c29225be28427161e1fc1d1 From f8299c5ed203c0fd582440b39b6035223cffea03 Mon Sep 17 00:00:00 2001 From: Tyree Webber Date: Fri, 1 Jul 2022 14:24:10 -0600 Subject: [PATCH 10/10] readd Vancouver,Toronto,Shanghai --- cities.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cities.html b/cities.html index f97200133..fffc42988 100644 --- a/cities.html +++ b/cities.html @@ -22,6 +22,9 @@

    Top cities, by population

      +
    1. Vancouver
      2. +
    2. Calgary (1,306,784)
      3. +
    3. Toronto (5,000,000)
    4. Shanghai (17,836,133)
    5. Istanbul (13,854,740)
    6. Karachi (12,991,000)