Fix merge conflicts

This commit is contained in:
Sean King 2022-08-01 18:17:09 -06:00
commit 081aa0fd05
No known key found for this signature in database
GPG key ID: 510C52BACD6E7257
167 changed files with 3481 additions and 2487 deletions

View file

@ -240,7 +240,7 @@ const api = {
// Follow requests
startFetchingFollowRequests (store) {
if (store.state.fetchers['followRequests']) return
if (store.state.fetchers.followRequests) return
const fetcher = store.state.backendInteractor.startFetchingFollowRequests({ store })
store.commit('addFetcher', { fetcherName: 'followRequests', fetcher })
@ -251,7 +251,7 @@ const api = {
store.commit('removeFetcher', { fetcherName: 'followRequests', fetcher })
},
removeFollowRequest (store, request) {
let requests = store.state.followRequests.filter((it) => it !== request)
const requests = store.state.followRequests.filter((it) => it !== request)
store.commit('setFollowRequests', requests)
},