From 25332bf751070dbabffc63aac420584327e45615 Mon Sep 17 00:00:00 2001 From: JdM Date: Thu, 16 May 2024 18:50:28 +0200 Subject: [PATCH] i --- index.html | 18 ++++++++---------- scripts/popup.js | 3 --- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/index.html b/index.html index 863c3bb..d4443c2 100644 --- a/index.html +++ b/index.html @@ -22,19 +22,17 @@ - <<<<<<< HEAD - + + - ======= - - >>>>>>> 5770eae1837efa0ddbe3ff007c12c08e2521d235 - - - + + + + - CESCOLEAKS + CESCOLEAKS diff --git a/scripts/popup.js b/scripts/popup.js index 26b290d..f51ef8d 100644 --- a/scripts/popup.js +++ b/scripts/popup.js @@ -32,7 +32,6 @@ function openRatingPopup(popupId, profId) { getTeachers("").then(function (teachers) { addTeachers(teachers); }); -<<<<<<< HEAD }); }); } @@ -55,8 +54,6 @@ function openCommentsPopup(popupId, profId) { getComments(profId).then(function (comments) { loadComments(comments); }); -======= ->>>>>>> 5770eae1837efa0ddbe3ff007c12c08e2521d235 }); }); }