From 8ea781969334efee92e8923f78869a5d63e36f48 Mon Sep 17 00:00:00 2001 From: bzrkrbddy081 Date: Fri, 30 Jun 2023 18:23:20 +0000 Subject: [PATCH 01/11] step 5?? --- cities.html | 1 + 1 file changed, 1 insertion(+) diff --git a/cities.html b/cities.html index bab3bfab4..e15906678 100644 --- a/cities.html +++ b/cities.html @@ -22,6 +22,7 @@

Top cities, by population

    +
  1. Cityville (17,840,133)
  2. Shanghai (17,836,133)
  3. Istanbul (13,854,740)
  4. Karachi (12,991,000)
    5. From ac8ca02d6087b8b6b114c891fea04a1e0717b092 Mon Sep 17 00:00:00 2001 From: dburnham1212 Date: Fri, 30 Jun 2023 14:25:20 -0400 Subject: [PATCH 02/11] Adding to cities --- cities.html | 1 + 1 file changed, 1 insertion(+) diff --git a/cities.html b/cities.html index bab3bfab4..4556b6c64 100644 --- a/cities.html +++ b/cities.html @@ -26,6 +26,7 @@

    Top cities, by population

  5. Istanbul (13,854,740)
  6. Karachi (12,991,000)
  7. Mumbai (12,478,447)
    8. +
  8. Toronto (12,425,222)
From ca6f1d58ab9d88df8060ec43dd0818c42c07d2d8 Mon Sep 17 00:00:00 2001 From: dburnham1212 Date: Fri, 30 Jun 2023 14:45:37 -0400 Subject: [PATCH 03/11] Adding a new town --- cities.html | 1 + 1 file changed, 1 insertion(+) diff --git a/cities.html b/cities.html index 8127a91d5..f36507dfc 100644 --- a/cities.html +++ b/cities.html @@ -28,6 +28,7 @@

Top cities, by population

  • Karachi (12,991,000)
  • Mumbai (12,478,447)
  • Toronto (12,425,222)
    • +
  • TownTown (12,425,222)
    • From 6f09a8827421bd8aa7b2e1d15fcb5c55ec8b178b Mon Sep 17 00:00:00 2001 From: bzrkrbddy081 Date: Fri, 30 Jun 2023 18:50:43 +0000 Subject: [PATCH 04/11] fight --- cities.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cities.html b/cities.html index f36507dfc..798e4a079 100644 --- a/cities.html +++ b/cities.html @@ -22,6 +22,7 @@

    Top cities, by population

      +
    1. Cityville (17,840,133)
    2. Shanghai (17,836,133)
    3. Istanbul (13,854,740)
      4. @@ -29,6 +30,9 @@

      Top cities, by population

    4. Mumbai (12,478,447)
    5. Toronto (12,425,222)
    6. TownTown (12,425,222)
      7. +
    7. No-commitmentcity (17,840,133)
      8. + +
    From c7cbedcb4486820d0bc3fadd0eb7439d47e00294 Mon Sep 17 00:00:00 2001 From: dburnham1212 Date: Fri, 30 Jun 2023 14:52:33 -0400 Subject: [PATCH 05/11] adding another city --- cities.html | 1 + 1 file changed, 1 insertion(+) diff --git a/cities.html b/cities.html index f36507dfc..40e327f9e 100644 --- a/cities.html +++ b/cities.html @@ -29,6 +29,7 @@

    Top cities, by population

  • Mumbai (12,478,447)
  • Toronto (12,425,222)
  • TownTown (12,425,222)
    • +
  • AnotherCity (12,425,222)
    • From 6b24ab4a30a8ae234e253e62927ff70139b6c26b Mon Sep 17 00:00:00 2001 From: dburnham1212 Date: Fri, 30 Jun 2023 15:06:39 -0400 Subject: [PATCH 06/11] adding another city --- cities.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cities.html b/cities.html index 4df13d164..5d3f3423a 100644 --- a/cities.html +++ b/cities.html @@ -31,9 +31,8 @@

    Top cities, by population

  • Toronto (12,425,222)
  • TownTown (12,425,222)
  • No-commitmentcity (17,840,133)
    • - -
  • AnotherCity (12,425,222)
    • +
  • Citytown (12,425,222)
    • From 4a33433d7aeb7b2116a422ddc129a1cc75043a0a Mon Sep 17 00:00:00 2001 From: adavidliang Date: Fri, 30 Jun 2023 15:08:41 -0400 Subject: [PATCH 07/11] randow test --- cities.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cities.html b/cities.html index 4df13d164..cfc7231ff 100644 --- a/cities.html +++ b/cities.html @@ -22,7 +22,7 @@

    Top cities, by population

      - +
    1. beijing (12,666,123)
    2. Cityville (17,840,133)
    3. Shanghai (17,836,133)
    4. Istanbul (13,854,740)
      5. From 7a6e2125d808109cb2d6dcd7a4bacae52046f314 Mon Sep 17 00:00:00 2001 From: bzrkrbddy081 Date: Fri, 30 Jun 2023 19:14:10 +0000 Subject: [PATCH 08/11] tony's changes --- cities.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cities.html b/cities.html index 4df13d164..b94e8f5ab 100644 --- a/cities.html +++ b/cities.html @@ -31,9 +31,8 @@

      Top cities, by population

    5. Toronto (12,425,222)
    6. TownTown (12,425,222)
    7. No-commitmentcity (17,840,133)
      8. - -
    8. AnotherCity (12,425,222)
      9. +
    From 58f34b5b94702937d0278a12562eec0f499561f8 Mon Sep 17 00:00:00 2001 From: dburnham1212 Date: Fri, 30 Jun 2023 15:21:59 -0400 Subject: [PATCH 09/11] Adding another citygit add .git add . --- cities.html | 1 + 1 file changed, 1 insertion(+) diff --git a/cities.html b/cities.html index 7736ae9e5..070052a9c 100644 --- a/cities.html +++ b/cities.html @@ -33,6 +33,7 @@

    Top cities, by population

  • No-commitmentcity (17,840,133)
  • AnotherCity (12,425,222)
  • Citytown (12,425,222)
    • +
  • Vancouver (12,425,222)
    • From 263d5316cf9c4f7124dcab0e64037af38981fb63 Mon Sep 17 00:00:00 2001 From: adavidliang Date: Fri, 30 Jun 2023 15:25:58 -0400 Subject: [PATCH 10/11] testing --- cities.html | 1 + 1 file changed, 1 insertion(+) diff --git a/cities.html b/cities.html index 7736ae9e5..2b4f711cb 100644 --- a/cities.html +++ b/cities.html @@ -33,6 +33,7 @@

    Top cities, by population

  • No-commitmentcity (17,840,133)
  • AnotherCity (12,425,222)
  • Citytown (12,425,222)
    • +
  • vanham (12,425,222)
    • From c46489a77411d4e0222a5cef9ac37cd954fe9b61 Mon Sep 17 00:00:00 2001 From: adavidliang Date: Fri, 30 Jun 2023 15:34:39 -0400 Subject: [PATCH 11/11] no --- cities.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/cities.html b/cities.html index ee46bf0c5..0c13aebff 100644 --- a/cities.html +++ b/cities.html @@ -33,11 +33,8 @@

    Top cities, by population

  • No-commitmentcity (17,840,133)
  • AnotherCity (12,425,222)
  • Citytown (12,425,222)
    • -<<<<<<< HEAD
  • vanham (12,425,222)
    • -=======
  • $$$TONYTOWN$$$
    • ->>>>>>> 59ed2bf8f4108c6184a80c34d0b71a1a6da8e60b
  • Vancouver (12,425,222)