From 2cd54d939200b2370c2a485ec5b88ce7160147e1 Mon Sep 17 00:00:00 2001
From: mahfoozm <mohammadmahfoozpersonal@gmail.com>
Date: Sun, 9 Jul 2023 14:58:25 -0400
Subject: [PATCH] fixes #6: search using multiple school IDs

---
 background.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/background.js b/background.js
index 23e0e45..3000748 100644
--- 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(