nicoeri/filebrowser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolved git conflict

Browse Source
This commit is contained in:
Joep 2023-09-11 22:33:59 +02:00
parent 101aba86fc
commit 24dd6b4fa1
No known key found for this signature in database
GPG Key ID: 6F5588F1DC2A8209
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/api/users.ts
View File

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