fixes #6: search using multiple school IDs

mahfoozm · Jul 9, 2023 · e1bfb48 · e1bfb48
2 parents ab6af88 + 3ed3d16
commit e1bfb48
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/background.js b/background.js
@@ -13,6 +13,7 @@ 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(
@@ -142,4 +143,4 @@ chrome.runtime.onConnect.addListener((port) => {
       port.postMessage({error});
     });
   });
-});
+});