FIXED STUFF FROM THE MERGE SORRY ;_;

2017-07-15 15:42:39 -07:00
parent 144db8ea1d
commit 4715161a93
2 changed files with 1 additions and 4 deletions
--- 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,