From 803842f809b3a481452c7354cf3b6a53e7fc2fcb Mon Sep 17 00:00:00 2001
From: kibigo! <marrus-sh@users.noreply.github.com>
Date: Sat, 15 Jul 2017 15:42:39 -0700
Subject: [PATCH] FIXED STUFF FROM THE MERGE SORRY ;_;

---
 app/javascript/mastodon/actions/compose.js | 2 +-
 app/javascript/mastodon/reducers/index.js  | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 4b8e9e50dc..2ce4e9b4e5 100644
--- 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;
diff --git a/app/javascript/mastodon/reducers/index.js b/app/javascript/mastodon/reducers/index.js
index 42b66d15f8..86cda2adcd 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,