Resolved git conflict

2023-09-11 22:33:59 +02:00 · 2023-09-11 22:33:59 +02:00 · 24dd6b4fa1
commit 24dd6b4fa1
parent 101aba86fc
1 changed files with 0 additions and 4 deletions
--- a/frontend/src/api/users.ts
+++ b/frontend/src/api/users.ts
@ -23,11 +23,7 @@ export async function create(user: IUser) {
  }
 }

-<<<<<<< HEAD
-export async function update(user: User, which = ["all"]) {
-=======
 export async function update(user: IUser, which = ["all"]) {
->>>>>>> vue3-bak
  await fetchURL(`/api/users/${user.id}`, {
    method: "PUT",
    body: JSON.stringify({