fixing error with the rebase in scrape.ts

Aspine · May 16, 2023 · 51d3851 · 51d3851
1 parent c68cb94
commit 51d3851
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/src/scrape.ts b/src/scrape.ts
@@ -366,7 +366,6 @@ async function get_recent(session: Session): Promise<Recent> {
       ].map(att => [att, x.getAttribute(att)])) as unknown as AttendanceEvent
     );
   const recentActivityArray =
-<<<<<<< HEAD
     [...document.querySelectorAll("gradebookScore")].map(x => {
       let item = Object.fromEntries([
         "date", "classname", "grade", "assignmentname",
@@ -378,13 +377,6 @@ async function get_recent(session: Session): Promise<Recent> {
       delete item.assignmentname;
       return item as ActivityEvent;
     });
-=======
-    [...document.querySelectorAll("gradebookScore")].map(x =>
-      Object.fromEntries([
-        "date", "classname", "grade", "assignmentname",
-      ].map(att => [att, x.getAttribute(att)])) as unknown as ActivityEvent
-    );
->>>>>>> b61b7a9 (Begin reimplementing recentActivity. Uncommenting lots of code, changed the name of some properties of an object because scraper returns different names.)
   return { recentAttendanceArray, recentActivityArray };
 }