post-merge fix

This commit is contained in:
Henry Jameson 2019-01-13 22:25:06 +03:00
parent f9fb85ee42
commit 5a3c9cfc9b

View file

@ -2,7 +2,7 @@ import { remove, slice, sortBy, toInteger, each, find, flatten, maxBy, minBy, me
import apiService from '../services/api/api.service.js' import apiService from '../services/api/api.service.js'
// import parse from '../services/status_parser/status_parser.js' // import parse from '../services/status_parser/status_parser.js'
export const emptyTl = (tl, userId) => (Object.assign(tl, { export const emptyTl = (tl, userId = 0) => (Object.assign(tl, {
statuses: [], statuses: [],
statusesObject: {}, statusesObject: {},
faves: [], faves: [],
@ -14,7 +14,6 @@ export const emptyTl = (tl, userId) => (Object.assign(tl, {
loading: false, loading: false,
followers: [], followers: [],
friends: [], friends: [],
userId: 0,
flushMarker: 0, flushMarker: 0,
userId userId
})) }))