FIXED STUFF FROM THE MERGE SORRY ;_;

7 years ago · 803842f809
parent e85716602c
commit 803842f809
2 changed files with 1 additions and 4 deletions
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@ -72,7 +72,7 @@ export function mentionCompose(account, router) {

 export function submitCompose() {
  return function (dispatch, getState) {
-    const status = getState().getIn(['compose', 'text'], '');
+    let status = getState().getIn(['compose', 'text'], '');

    if (!status || !status.length) {
      return;
--- 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,