diff options
| author | kibigo! <marrus-sh@users.noreply.github.com> | 2017-07-15 15:42:39 -0700 |
|---|---|---|
| committer | kibigo! <marrus-sh@users.noreply.github.com> | 2017-07-15 15:42:39 -0700 |
| commit | 4715161a93e8ca4ec8c9865deefa48e08fd8e878 (patch) | |
| tree | 51b72dfd587f371cce7b5d754f3a0faf513dab0c /app/javascript | |
| parent | 144db8ea1dc606e462a25b4be642f650606103d0 (diff) | |
FIXED STUFF FROM THE MERGE SORRY ;_;
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/mastodon/actions/compose.js | 2 | ||||
| -rw-r--r-- | app/javascript/mastodon/reducers/index.js | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js index 4b8e9e50d..2ce4e9b4e 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 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, |