Fix merge conflict.

app/soapbox/features/configuration/index.js

@@ -12,6 +12,7 @@ import {
   Checkbox,
   FileChooser,
   ColorWithPicker,
+  FileChooserLogo,
 } from 'soapbox/features/forms';
 import StillImage from 'soapbox/components/still_image';
 import {
@@ -262,7 +263,7 @@ class ConfigSoapbox extends ImmutablePureComponent {
                   {this.state.logo ? (<StillImage src={this.state.logo || ''} />) : (<StillImage src={this.props.logo || ''} />)}
                 </div>
                 <div className='fields-row__column fields-group fields-row__column-6'>
-                  <FileChooser
+                  <FileChooserLogo
                     label={<FormattedMessage id='soapbox_settings.fields.logo_label' defaultMessage='Logo' />}
                     name='logo'
                     hint={<FormattedMessage id='soapbox_settings.hints.logo' defaultMessage='SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio' />}

app/soapbox/features/forms/index.js

@@ -320,3 +320,11 @@ export const FileChooser = props => (
 FileChooser.defaultProps = {
   accept: ['image/jpeg', 'image/png', 'image/gif', 'image/webp'],
 };
+
+export const FileChooserLogo = props => (
+  <SimpleInput type='file' {...props} />
+);
+
+FileChooserLogo.defaultProps = {
+  accept: ['image/svg', 'image/png'],
+};