resolve conflict in cart action js

ecom-web/src/util/cart_api_util.js

 import axios from 'axios';
 
-<<<<<<< HEAD
-export const postCart = (data) => {
-    return axios.post("http://localhost:8080/api/carts", data)
-}
-
-export const getCartById = (id) => {
-    return axios.get("http://localhost:8080/api/carts", {
-        params: {
-            userId: id
-        }
-    })
-=======
 export const fetchUserCart = userEmail => {
     return axios.get(`http://localhost:8080/api/carts/${userEmail}`)
 }
@@ -23,5 +11,4 @@ export const createCart = newCart => {
 export const updateCart = (updatedCart, userEmail) => {
     // debugger
     return axios.put(`http://localhost:8080/api/carts/${userEmail}`, updatedCart)
->>>>>>> 1f99e20fa13caaa629b4886d2be1b9d96bb9aa82
 }
\ No newline at end of file