fixes #6: search using multiple school IDs

mahfoozm · Jul 9, 2023 · 2cd54d9 · 2cd54d9
1 parent e1bfb48
commit 2cd54d9
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/background.js b/background.js
@@ -13,7 +13,6 @@ const SCHOOL_IDS = [
 ];
 
 // for searchProfessor and getProfessor, use a self hosted proxy to bypass CORS restrictions
-<<<<<<< HEAD
 const searchProfessor = async (name, schoolIDs) => {
   for (const schoolID of schoolIDs) {
     const response = await fetch(