Fix merge conflicts

Hipo · Aug 19, 2024 · b7b1cf6 · b7b1cf6
2 parents 96cba75 + 53d6aa7
commit b7b1cf6
Showing 1 changed file with 68 additions and 29 deletions.
diff --git a/world_universities_and_domains.json b/world_universities_and_domains.json
@@ -1,4 +1,20 @@
 [
+  {
+    "name": "Toronto Baptist Seminary and Bible College",
+    "domains": ["tbs.edu"],
+    "web_pages": ["https://tbs.edu"],
+    "country": "Canada",
+    "alpha_two_code": "CA",
+    "state-province": "Ontario"
+  },
+  {
+    "name": "Universidade Comunitária da Região de Chapecó - Unochapecó",
+    "domains": ["unochapeco.edu.br"],
+    "web_pages": ["https://unochapeco.edu.br"],
+    "country": "Brazil",
+    "alpha_two_code": "BR",
+    "state-province": null
+  },
   {
     "name": "West Herts College",
     "domains": ["student.westherts.ac.uk", "westherts.ac.uk"],
@@ -6070,7 +6086,8 @@
       "alpha_two_code": "US",
       "state-province": null,
       "domains": [
-          "iit.edu"
+          "iit.edu",
+          "hawk.iit.edu"
       ],
       "country": "United States"
   },
@@ -12972,7 +12989,8 @@
       "alpha_two_code": "US",
       "state-province": null,
       "domains": [
-          "und.edu"
+          "und.edu",
+          "nodak.edu"
       ],
       "country": "United States"
   },
@@ -26308,7 +26326,8 @@
       "alpha_two_code": "CA",
       "state-province": "Ontario",
       "domains": [
-          "utoronto.ca"
+          "utoronto.ca",
+          "toronto.edu"
       ],
       "country": "Canada"
   },
@@ -26396,18 +26415,6 @@
       ],
       "country": "Canada"
   },
-  {
-    "web_pages": [
-        "http://eecg.toronto.edu/"
-    ],
-    "name": "The Computer Engineering Research Group,University of Toronto",
-    "alpha_two_code": "CA",
-    "state-province": "Ontario",
-    "domains": [
-        "eecg.toronto.edu"
-    ],
-    "country": "Canada"
-  },
   {
       "web_pages": [
           "http://www.wlu.ca/"
@@ -43707,7 +43714,8 @@
       "alpha_two_code": "DE",
       "state-province": null,
       "domains": [
-          "uni-duesseldorf.de"
+          "uni-duesseldorf.de",
+          "hhu.de"
       ],
       "country": "Germany"
   },
@@ -48708,7 +48716,6 @@
       ],
       "country": "India"
   },
-
   {
       "web_pages": [
           "http://www.mdsuajmer.ac.in/"
@@ -111005,18 +111012,6 @@
       ],
       "country": "United States"
   },
-  {
-      "web_pages": [
-          "http://www.bcc.edu"
-      ],
-      "name": "Burlington County College",
-      "alpha_two_code": "US",
-      "state-province": null,
-      "domains": [
-          "bcc.edu"
-      ],
-      "country": "United States"
-  },
   {
       "web_pages": [
           "http://www.camdencc.edu"
@@ -120629,6 +120624,50 @@
         ],
         "country": "India"
     },
+    {
+        "web_pages": [
+            "http://www.claremont.edu/"
+        ],
+        "name": "Claremont Colleges",
+        "alpha_two_code": "US",
+        "state-province": null,
+        "domains": [
+            "claremont.edu"
+        ],
+        "country": "United States"
+    },
+    {
+        "name": "University of Economics and Humanities Warsaw",
+        "domains": ["students.vizja.pl"],
+        "web_pages": ["https://vizja.pl"],
+        "country": "Poland",
+        "alpha_two_code": "PL",
+        "state-province": null
+    },
+    {
+        "web_pages": [
+            "http://www.rcbc.edu/"
+        ],
+        "name": "Rowan College at Burlington County",
+        "alpha_two_code": "US",
+        "state-province": null,
+        "domains": [
+            "rcbc.edu"
+        ],
+        "country": "United States"
+    },
+    {
+        "web_pages": [
+            "http://www.jefferson.edu/"
+        ],
+        "name": "Thomas Jefferson University",
+        "alpha_two_code": "US",
+        "state-province": null,
+        "domains": [
+            "jefferson.edu"
+        ],
+        "country": "United States"
+    },
     {
         "web_pages": [
             "https://qahs.eq.edu.au/"