Fix merge conflicts

2022-08-06 22:02:21 -06:00 · 2022-08-06 22:02:21 -06:00 · dc9951d400
commit dc9951d400
parent 18d69f93d3 610720f164
166 changed files with 2374 additions and 1602 deletions
--- a/src/components/interactions/interactions.js
+++ b/src/components/interactions/interactions.js
@ -14,7 +14,7 @@ const Interactions = {
  data () {
    return {
      allowFollowingMove: this.$store.state.users.currentUser.allow_following_move,
-      filterMode: tabModeDict['mentions'],
+      filterMode: tabModeDict.mentions,
      canSeeReports: ['moderator', 'admin'].includes(this.$store.state.users.currentUser.role)
    }
  },