From bb420ed0bbe1611cbd9c47ebad3fc77f0d3d6517 Mon Sep 17 00:00:00 2001 From: chr Date: Mon, 5 Jul 2021 23:57:46 +0200 Subject: [PATCH] missed git merge --- .../mastodon/features/compose/components/compose_form.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js index 7b477f491..b899cd3cc 100644 --- a/app/javascript/mastodon/features/compose/components/compose_form.js +++ b/app/javascript/mastodon/features/compose/components/compose_form.js @@ -196,11 +196,6 @@ class ComposeForm extends ImmutablePureComponent { render () { const { intl, onPaste, showSearch } = this.props; const disabled = this.props.isSubmitting; -<<<<<<< HEAD -======= - const text = [this.props.spoilerText, countableText(this.props.text)].join(''); - const disabledButton = disabled || this.props.isUploading || this.props.isChangingUpload || length(text) > 4096 || (text.length !== 0 && text.trim().length === 0 && !anyMedia); ->>>>>>> scalybiz-3.2rc let publishText = ''; if (this.props.privacy === 'private' || this.props.privacy === 'direct') {