From 30aa9eeed218aeb608ed1ac60e474df89826cf7e Mon Sep 17 00:00:00 2001
From: Nuwan <nuwanchaturanga@gmail.com>
Date: Mon, 5 Feb 2024 19:10:40 +0530
Subject: [PATCH] merge conflicts fix

---
 jam-ui/src/helpers/rest.js | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/jam-ui/src/helpers/rest.js b/jam-ui/src/helpers/rest.js
index db157adb2..08ee4a4fc 100644
--- a/jam-ui/src/helpers/rest.js
+++ b/jam-ui/src/helpers/rest.js
@@ -42,7 +42,6 @@ export const getPeopleIndex = () => {
       .catch(error => reject(error));
   });
 };
-<<<<<<< HEAD
 
 export const getLobbyUsers = () => {
   return new Promise((resolve, reject) => {
@@ -51,27 +50,14 @@ export const getLobbyUsers = () => {
     .catch(error => reject(error))
   })
 }
-=======
->>>>>>> c16be142076c0228762477ae926a56507df93da1
 
 export const updateUser = (id, data) => {
   return new Promise((resolve, reject) => {
-<<<<<<< HEAD
-    apiFetch(`/users/${id}`, {
-      method: 'POST',
-      body: JSON.stringify(data)
-    })
-    .then(response => resolve(response))
-    .catch(error => reject(error))
-  })
-}
-=======
     apiFetch('/genres')
       .then(response => resolve(response))
       .catch(error => reject(error));
   });
 };
->>>>>>> c16be142076c0228762477ae926a56507df93da1
 
 export const getGenres = () => {
   return new Promise((resolve, reject) => {