From 8fbb4be0ad05d5814feb2ee8483f8c8155b5a155 Mon Sep 17 00:00:00 2001
From: al8763be <al8763be-s@student.lu.se>
Date: Wed, 20 Mar 2024 19:38:52 +0100
Subject: [PATCH] merge again

---
 frontend/src/API/API.ts | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/frontend/src/API/API.ts b/frontend/src/API/API.ts
index 636d8e3..6a508b5 100644
--- a/frontend/src/API/API.ts
+++ b/frontend/src/API/API.ts
@@ -274,15 +274,6 @@ export const api: API = {
     }
   },
 
-<<<<<<< HEAD
-  async getWeeklyReportsForProject(
-    username: string,
-    projectName: string,
-    token: string,
-  ) {
-    try {
-      const response = await fetch("/api/getWeeklyReportsUser", {
-=======
   async getWeeklyReportsForUser(
     username: string,
     projectName: string,
@@ -290,16 +281,11 @@ export const api: API = {
   ): Promise<APIResponse<WeeklyReport[]>> {
     try {
       const response = await fetch(`/api/getWeeklyReportsUser?username=${username}&projectName=${projectName}`, {
->>>>>>> af5813681d11500c0cfe723af1b8d2522bf277d2
         method: "GET",
         headers: {
           "Content-Type": "application/json",
           Authorization: "Bearer " + token,
         },
-<<<<<<< HEAD
-        body: JSON.stringify({ username, projectName }),
-=======
->>>>>>> af5813681d11500c0cfe723af1b8d2522bf277d2
       });
 
       if (!response.ok) {