fix merge conflicts

This commit is contained in:
Mohit Panjwani
2020-01-05 13:45:10 +05:30
12 changed files with 1108 additions and 157 deletions

View File

@ -2,7 +2,7 @@ import * as types from './mutation-types'
export const fetchCategories = ({ commit, dispatch, state }, data) => {
return new Promise((resolve, reject) => {
window.axios.get(`/api/categories/`).then((response) => {
window.axios.get(`/api/categories`).then((response) => {
commit(types.SET_CATEGORIES, response.data)
resolve(response)
}).catch((err) => {