i

asterjdm · May 16, 2024 · 25332bf · 25332bf
1 parent fe70bed
commit 25332bf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/index.html b/index.html
@@ -22,19 +22,17 @@
     <script src="./scripts/utils/objectToFormData.js"></script>
     <script src="./scripts/getTeachers.js"></script>
     <script src="./scripts/sendRating.js"></script>
-    <<<<<<< HEAD <script src="./scripts/getComments.js">
-        </script>
-        <script src="./scripts/sendComment.js"></script>
+    <script src="./scripts/getComments.js">
+    </script>
+    <script src="./scripts/sendComment.js"></script>
 
-        =======
-        <script src="./scripts/sendComment.js"></script>
-        >>>>>>> 5770eae1837efa0ddbe3ff007c12c08e2521d235
-        <script src="./scripts/popup.js" defer></script>
-        <script src="./scripts/loadComments.js" defer></script>
-        <script src="./scripts/page.js" defer></script>
+    <script src="./scripts/sendComment.js"></script>
+    <script src="./scripts/popup.js" defer></script>
+    <script src="./scripts/loadComments.js" defer></script>
+    <script src="./scripts/page.js" defer></script>
 
 
-        <title>CESCOLEAKS</title>
+    <title>CESCOLEAKS</title>
 </head>
 
 <body>

diff --git 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
     });
   });
 }