Resolved merge conflicts.

tongping · Aug 3, 2018 · 7412918 · 7412918
2 parents 7ffc1c0 + e013dd2
commit 7412918
Show file tree

Hide file tree

Showing 20 changed files with 66,945 additions and 6,041 deletions.
diff --git a/acm-fellows.csv b/acm-fellows.csv
diff --git a/articles.json b/articles.json
diff --git a/country-info.csv b/country-info.csv
@@ -65,6 +65,7 @@ Imperial College London,europe
 KAIST,asia
 KAUST,asia
 King Abdulaziz University,asia
+KTH Royal Institute of Technology,europe
 KU Leuven,europe
 Lebanese American University,asia
 Lund University,europe
@@ -85,6 +86,7 @@ Polytechnic University of Catalonia,europe
 POSTECH,asia
 Qatar University,asia
 Queen’s University,canada
+Ruhr-University Bochum,europe
 RWTH Aachen,europe
 Ryerson University,canada
 Shanghai Jiao Tong University,asia
@@ -95,6 +97,7 @@ Singapore Management University,asia
 SUTD,asia
 Tata Institute of Fundamental Research,asia
 Tsinghua University,asia
+TU Braunschweig,europe
 TU Darmstadt,europe
 TU Delft,europe
 TU Dresden,europe
@@ -184,3 +187,5 @@ Koç University,europe
 RMIT University,australasia
 University of Sussex,europe
 University of Konstanz,europe
+University of Stuttgart,europe
+National Tsing Hua University,asia
diff --git a/csrankings.csv b/csrankings.csv