diff options
Diffstat (limited to 'app/javascript/mastodon/reducers/index.js')
| -rw-r--r-- | app/javascript/mastodon/reducers/index.js | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/javascript/mastodon/reducers/index.js b/app/javascript/mastodon/reducers/index.js index 42b66d15f..86cda2adc 100644 --- a/app/javascript/mastodon/reducers/index.js +++ b/app/javascript/mastodon/reducers/index.js @@ -34,11 +34,8 @@ const reducers = { statuses, relationships, settings, -<<<<<<< HEAD local_settings, -======= push_notifications, ->>>>>>> upstream cards, reports, contexts, |