直しきれてないコンフリクトの解消

2022-03-15 19:32:16 +09:00
parent 69ad0a8763
commit 21b64cfeeb
34 changed files with 11 additions and 305 deletions
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -177,18 +177,6 @@ export function submitCompose(routerHistory) {

    dispatch(submitComposeRequest());

-<<<<<<< HEAD
-    api(getState).post('/api/v1/statuses', {
-      status,
-      in_reply_to_id: getState().getIn(['compose', 'in_reply_to'], null),
-      media_ids: media.map(item => item.get('id')),
-      sensitive: getState().getIn(['compose', 'sensitive']),
-      spoiler_text: getState().getIn(['compose', 'spoiler']) ? getState().getIn(['compose', 'spoiler_text'], '') : '',
-      visibility: getState().getIn(['compose', 'privacy']),
-      poll: getState().getIn(['compose', 'poll'], null),
-      quote_id: getState().getIn(['compose', 'quote_from'], null),
-    }, {
-=======
    api(getState).request({
      url: statusId === null ? '/api/v1/statuses' : `/api/v1/statuses/${statusId}`,
      method: statusId === null ? 'post' : 'put',
@@ -200,8 +188,8 @@ export function submitCompose(routerHistory) {
        spoiler_text: getState().getIn(['compose', 'spoiler']) ? getState().getIn(['compose', 'spoiler_text'], '') : '',
        visibility: getState().getIn(['compose', 'privacy']),
        poll: getState().getIn(['compose', 'poll'], null),
+        quote_id: getState().getIn(['compose', 'quote_from'], null),
      },
->>>>>>> v3.5.0rc1
      headers: {
        'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']),
      },
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -45,11 +45,7 @@ defineMessages({
 });

 const fetchRelatedRelationships = (dispatch, notifications) => {
-<<<<<<< HEAD
-  const accountIds = notifications.map(item => item.account.id);
-=======
  const accountIds = notifications.filter(item => ['follow', 'follow_request', 'admin.sign_up'].indexOf(item.type) !== -1).map(item => item.account.id);
->>>>>>> v3.5.0rc1

  if (accountIds.length > 0) {
    dispatch(fetchRelationships(accountIds));
--- a/app/javascript/mastodon/actions/statuses.js
+++ b/app/javascript/mastodon/actions/statuses.js
@@ -30,14 +30,12 @@ export const STATUS_COLLAPSE = 'STATUS_COLLAPSE';

 export const REDRAFT = 'REDRAFT';

-<<<<<<< HEAD
 export const QUOTE_REVEAL = 'QUOTE_REVEAL';
 export const QUOTE_HIDE   = 'QUOTE_HIDE';
-=======
+
 export const STATUS_FETCH_SOURCE_REQUEST = 'STATUS_FETCH_SOURCE_REQUEST';
 export const STATUS_FETCH_SOURCE_SUCCESS = 'STATUS_FETCH_SOURCE_SUCCESS';
 export const STATUS_FETCH_SOURCE_FAIL    = 'STATUS_FETCH_SOURCE_FAIL';
->>>>>>> v3.5.0rc1

 export function fetchStatusRequest(id, skipLoading) {
  return {
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -166,18 +166,12 @@ class Status extends ImmutablePureComponent {
    this.setState({ showMedia: !this.state.showMedia });
  }

-<<<<<<< HEAD
  handleToggleQuoteMediaVisibility = () => {
    this.setState({ showQuoteMedia: !this.state.showQuoteMedia });
  }

-  handleClick = () => {
-    if (this.props.onClick) {
-      this.props.onClick();
-=======
  handleClick = e => {
    if (e && (e.button !== 0 || e.ctrlKey || e.metaKey)) {
->>>>>>> v3.5.0rc1
      return;
    }

@@ -197,7 +191,6 @@ class Status extends ImmutablePureComponent {
      return;
    }

-<<<<<<< HEAD
  handleQuoteClick = () => {
    if (!this.context.router) {
      return;
@@ -208,11 +201,7 @@ class Status extends ImmutablePureComponent {
  }

  handleAccountClick = (e) => {
-    if (this.context.router && e.button === 0 && !(e.ctrlKey || e.metaKey)) {
-      const id = e.currentTarget.getAttribute('data-id');
-=======
    if (e) {
->>>>>>> v3.5.0rc1
      e.preventDefault();
    }

--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -347,15 +347,10 @@ class StatusActionBar extends ImmutablePureComponent {
    return (
      <div className='status__action-bar'>
        <IconButton className='status__action-bar-button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} counter={status.get('replies_count')} obfuscateCount />
-<<<<<<< HEAD
-        <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate}  active={status.get('reblogged')} pressed={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} />
-        <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
-        <IconButton className='status__action-bar-button' disabled={anonymousAccess || !publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_quote) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} />
-=======
        <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} pressed={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} counter={withCounters ? status.get('reblogs_count') : undefined} />
        <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} counter={withCounters ? status.get('favourites_count') : undefined} />
+        <IconButton className='status__action-bar-button' disabled={anonymousAccess || !publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_quote) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} />

->>>>>>> v3.5.0rc1
        {shareButton}

        <div className='status__action-bar-dropdown'>
--- a/app/javascript/mastodon/containers/status_container.js
+++ b/app/javascript/mastodon/containers/status_container.js
@@ -25,12 +25,9 @@ import {
  hideStatus,
  revealStatus,
  toggleStatusCollapse,
-<<<<<<< HEAD
  hideQuote,
  revealQuote,
-=======
  editStatus,
->>>>>>> v3.5.0rc1
 } from '../actions/statuses';
 import {
  unmuteAccount,
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -30,14 +30,9 @@ const messages = defineMessages({
  spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Write your warning here' },
  publish: { id: 'compose_form.publish', defaultMessage: 'Toot' },
  publishLoud: { id: 'compose_form.publish_loud', defaultMessage: '{publish}!' },
-<<<<<<< HEAD
-
-  
  utilBtns_goji: { id: 'compose_form.utilBtns_goji', defaultMessage: 'Typo!!!' },
-  utilBtns_harukin: { id: 'compose_form.utilBtns_harukin', defaultMessage: 'Burn Harukin' }
-=======
+  utilBtns_harukin: { id: 'compose_form.utilBtns_harukin', defaultMessage: 'Burn Harukin' },
  saveChanges: { id: 'compose_form.save_changes', defaultMessage: 'Save changes' },
->>>>>>> v3.5.0rc1
 });

 export default @injectIntl
@@ -71,14 +66,11 @@ class ComposeForm extends ImmutablePureComponent {
    onPickEmoji: PropTypes.func.isRequired,
    showSearch: PropTypes.bool,
    anyMedia: PropTypes.bool,
-<<<<<<< HEAD
    singleColumn: PropTypes.bool,  
    onGojiSubmit: PropTypes.func.isRequired,
-    onHarukinSubmit: PropTypes.func.isRequired
-=======
+    onHarukinSubmit: PropTypes.func.isRequired,
    isInReply: PropTypes.bool,
    singleColumn: PropTypes.bool,
->>>>>>> v3.5.0rc1
  };

  static defaultProps = {
--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@@ -146,27 +146,9 @@ class Compose extends React.PureComponent {

      header = (
        <nav className='drawer__header'>
-<<<<<<< HEAD
          {tabs.map(tabId => (
 	    <Fragment key={tabId}>{this.tab(tabId)}</Fragment>
          ))}
-=======
-          <Link to='/getting-started' className='drawer__tab' title={intl.formatMessage(messages.start)} aria-label={intl.formatMessage(messages.start)}><Icon id='bars' fixedWidth /></Link>
-          {!columns.some(column => column.get('id') === 'HOME') && (
-            <Link to='/home' className='drawer__tab' title={intl.formatMessage(messages.home_timeline)} aria-label={intl.formatMessage(messages.home_timeline)}><Icon id='home' fixedWidth /></Link>
-          )}
-          {!columns.some(column => column.get('id') === 'NOTIFICATIONS') && (
-            <Link to='/notifications' className='drawer__tab' title={intl.formatMessage(messages.notifications)} aria-label={intl.formatMessage(messages.notifications)}><Icon id='bell' fixedWidth /></Link>
-          )}
-          {!columns.some(column => column.get('id') === 'COMMUNITY') && (
-            <Link to='/public/local' className='drawer__tab' title={intl.formatMessage(messages.community)} aria-label={intl.formatMessage(messages.community)}><Icon id='users' fixedWidth /></Link>
-          )}
-          {!columns.some(column => column.get('id') === 'PUBLIC') && (
-            <Link to='/public' className='drawer__tab' title={intl.formatMessage(messages.public)} aria-label={intl.formatMessage(messages.public)}><Icon id='globe' fixedWidth /></Link>
-          )}
-          <a href='/settings/preferences' className='drawer__tab' title={intl.formatMessage(messages.preferences)} aria-label={intl.formatMessage(messages.preferences)}><Icon id='cog' fixedWidth /></a>
-          <a href='/auth/sign_out' className='drawer__tab' title={intl.formatMessage(messages.logout)} aria-label={intl.formatMessage(messages.logout)} onClick={this.handleLogoutClick}><Icon id='sign-out' fixedWidth /></a>
->>>>>>> v3.5.0rc1
        </nav>
      );
    }
--- a/app/javascript/mastodon/features/directory/index.js
+++ b/app/javascript/mastodon/features/directory/index.js
@@ -12,10 +12,7 @@ import AccountCard from './components/account_card';
 import RadioButton from 'mastodon/components/radio_button';
 import LoadMore from 'mastodon/components/load_more';
 import ScrollContainer from 'mastodon/containers/scroll_container';
-<<<<<<< HEAD
-=======
 import LoadingIndicator from 'mastodon/components/loading_indicator';
->>>>>>> v3.5.0rc1

 const messages = defineMessages({
  title: { id: 'column.directory', defaultMessage: 'Browse profiles' },
--- a/app/javascript/mastodon/features/followers/index.js
+++ b/app/javascript/mastodon/features/followers/index.js
@@ -140,11 +140,7 @@ class Followers extends ImmutablePureComponent {
          hasMore={hasMore}
          isLoading={isLoading}
          onLoadMore={this.handleLoadMore}
-<<<<<<< HEAD
-          prepend={<HeaderContainer accountId={this.props.params.accountId} hideTabs />}
-=======
          prepend={<HeaderContainer accountId={this.props.accountId} hideTabs />}
->>>>>>> v3.5.0rc1
          alwaysPrepend
          append={remoteMessage}
          emptyMessage={emptyMessage}
--- a/app/javascript/mastodon/features/following/index.js
+++ b/app/javascript/mastodon/features/following/index.js
@@ -140,11 +140,7 @@ class Following extends ImmutablePureComponent {
          hasMore={hasMore}
          isLoading={isLoading}
          onLoadMore={this.handleLoadMore}
-<<<<<<< HEAD
-          prepend={<HeaderContainer accountId={this.props.params.accountId} hideTabs />}
-=======
          prepend={<HeaderContainer accountId={this.props.accountId} hideTabs />}
->>>>>>> v3.5.0rc1
          alwaysPrepend
          append={remoteMessage}
          emptyMessage={emptyMessage}
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@ -108,16 +108,6 @@ class GettingStarted extends ImmutablePureComponent {
    );
    height += 48;

-<<<<<<< HEAD
-      if (profile_directory) {
-        navItems.push(
-          <ColumnLink key='directory' icon='address-book' text={intl.formatMessage(messages.profile_directory)} to='/directory' />,
-          <ColumnLink key='infomation' icon='bullhorn' text={intl.formatMessage(messages.admin_notifications)} to='/timelines/tag/Yづinfo' />,
-        );
-
-        height += 48*2;
-      }
-=======
    if (multiColumn) {
      navItems.push(
        <ColumnLink key='community_timeline' icon='users' text={intl.formatMessage(messages.community_timeline)} to='/public/local' />,
@@ -125,23 +115,12 @@ class GettingStarted extends ImmutablePureComponent {
      );

      height += 48*2;
->>>>>>> v3.5.0rc1

      navItems.push(
        <ColumnSubheading key='header-personal' text={intl.formatMessage(messages.personal)} />,
      );

      height += 34;
-<<<<<<< HEAD
-    } else if (profile_directory) {
-      navItems.push(
-        <ColumnLink key='directory' icon='address-book' text={intl.formatMessage(messages.profile_directory)} to='/directory' />,
-        <ColumnLink key='infomation' icon='bullhorn' text={intl.formatMessage(messages.admin_notifications)} to='/timelines/tag/Yづinfo' />,
-      );
-
-      height += 48*2;
-=======
->>>>>>> v3.5.0rc1
    }

    if (multiColumn && !columns.find(item => item.get('id') === 'HOME')) {
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.js
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.js
@@ -185,12 +185,8 @@ class Footer extends ImmutablePureComponent {
        <IconButton className='status__action-bar-button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} counter={status.get('replies_count')} obfuscateCount />
        <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate}  active={status.get('reblogged')} pressed={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} counter={status.get('reblogs_count')} />
        <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} counter={status.get('favourites_count')} />
-<<<<<<< HEAD
        <IconButton className='status__action-bar-button' disabled={!publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_quote) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} />
-        {withOpenButton && <IconButton className='status__action-bar-button' title={intl.formatMessage(messages.open)} icon='external-link' onClick={this.handleOpenClick} />}
-=======
        {withOpenButton && <IconButton className='status__action-bar-button' title={intl.formatMessage(messages.open)} icon='external-link' onClick={this.handleOpenClick} href={status.get('url')} />}
->>>>>>> v3.5.0rc1
      </div>
    );
  }
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@@ -218,12 +218,7 @@ class ColumnsArea extends ImmutablePureComponent {
    const columnIndex = getIndex(this.context.router.history.location.pathname);

    if (singleColumn) {
-<<<<<<< HEAD
-      const floatingActionButton = shouldHideFAB(this.context.router.history.location.pathname) ? null : <Link key='floating-action-button' to='/statuses/new' className={classNames('floating-action-button', { 'bottom-bar': place_tab_bar_at_bottom })} aria-label={intl.formatMessage(messages.publish)}><Icon id='pencil' /></Link>;
-=======
      const floatingActionButton = shouldHideFAB(this.context.router.history.location.pathname) ? null : <Link key='floating-action-button' to='/publish' className='floating-action-button' aria-label={intl.formatMessage(messages.publish)}><Icon id='pencil' /></Link>;
->>>>>>> v3.5.0rc1
-
      const content = columnIndex !== -1 ? (
        <ReactSwipeableViews key='content' className={classNames('swipeable-view__wrapper', { 'bottom-bar': place_tab_bar_at_bottom })} hysteresis={0.2} threshold={15} index={columnIndex} onChangeIndex={this.handleSwipe} onTransitionEnd={this.handleAnimationEnd} animateTransitions={shouldAnimate} springConfig={{ duration: '400ms', delay: '0s', easeFunction: 'ease' }} style={{ height: '100%' }} disabled={disableSwiping}>
          {links.map(this.renderView)}
--- a/app/javascript/mastodon/features/ui/components/tabs_bar.js
+++ b/app/javascript/mastodon/features/ui/components/tabs_bar.js
@@ -10,21 +10,12 @@ import { place_tab_bar_at_bottom, show_tab_bar_label } from 'mastodon/initial_st
 import classNames from 'classnames';

 export const links = [
-<<<<<<< HEAD
-  <NavLink className='tabs-bar__link' to='/timelines/home' data-preview-title-id='column.home' data-preview-icon='home' ><Icon id='home' fixedWidth /><span className='tabs-bar__link__full-label'><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></span><span className='tabs-bar__link__short-label'><FormattedMessage id='navigation_bar.short.home' defaultMessage='Home' /></span></NavLink>,
-  <NavLink className='tabs-bar__link' to='/notifications' data-preview-title-id='column.notifications' data-preview-icon='bell' ><NotificationsCounterIcon /><span className='tabs-bar__link__full-label'><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></span><span className='tabs-bar__link__short-label'><FormattedMessage id='navigation_bar.short.notifications' defaultMessage='Notif.' /></span></NavLink>, 
-  <NavLink className='tabs-bar__link' exact to='/timelines/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><Icon id='users' fixedWidth /><span className='tabs-bar__link__full-label'><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></span><span className='tabs-bar__link__short-label'><FormattedMessage id='navigation_bar.short.community_timeline' defaultMessage='LTL' /></span></NavLink>,
-  <NavLink className='tabs-bar__link' exact to='/timelines/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon id='globe' fixedWidth /><span className='tabs-bar__link__full-label'><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></span><span className='tabs-bar__link__short-label'><FormattedMessage id='navigation_bar.short.public_timeline' defaultMessage='FTL' /></span></NavLink>,
-  <NavLink className='tabs-bar__link optional' to='/search' data-preview-title-id='tabs_bar.search' data-preview-icon='bell' ><Icon id='search' fixedWidth /><span className='tabs-bar__link__full-label'><FormattedMessage id='tabs_bar.search' defaultMessage='Search' /></span><span className='tabs-bar__link__short-label'><FormattedMessage id='navigation_bar.short.search' defaultMessage='Search' /></span></NavLink>,
-  <NavLink className='tabs-bar__link hamburger' to='/getting-started' data-preview-title-id='getting_started.heading' data-preview-icon='bars' ><Icon id='bars' fixedWidth /></NavLink>,
-=======
  <NavLink className='tabs-bar__link' to='/home' data-preview-title-id='column.home' data-preview-icon='home' ><Icon id='home' fixedWidth /><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></NavLink>,
  <NavLink className='tabs-bar__link' to='/notifications' data-preview-title-id='column.notifications' data-preview-icon='bell' ><NotificationsCounterIcon /><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></NavLink>,
  <NavLink className='tabs-bar__link' to='/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><Icon id='users' fixedWidth /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>,
  <NavLink className='tabs-bar__link' exact to='/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon id='globe' fixedWidth /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>,
  <NavLink className='tabs-bar__link optional' to='/explore' data-preview-title-id='tabs_bar.search' data-preview-icon='search' ><Icon id='search' fixedWidth /><FormattedMessage id='tabs_bar.search' defaultMessage='Search' /></NavLink>,
  <NavLink className='tabs-bar__link' style={{ flexGrow: '0', flexBasis: '30px' }} to='/getting-started' data-preview-title-id='getting_started.heading' data-preview-icon='bars' ><Icon id='bars' fixedWidth /></NavLink>,
->>>>>>> v3.5.0rc1
 ];

 export function getIndex (path) {
--- a/app/javascript/mastodon/features/ui/components/video_modal.js
+++ b/app/javascript/mastodon/features/ui/components/video_modal.js
@@ -21,11 +21,7 @@ export default class VideoModal extends ImmutablePureComponent {
  };

  componentDidMount () {
-<<<<<<< HEAD
-    const { media, onChangeBackgroundColor, onClose } = this.props;
-=======
    const { media, onChangeBackgroundColor } = this.props;
->>>>>>> v3.5.0rc1

    const backgroundColor = getAverageFromBlurhash(media.get('blurhash'));

--- a/app/javascript/mastodon/features/ui/containers/modal_container.js
+++ b/app/javascript/mastodon/features/ui/containers/modal_container.js
@@ -3,14 +3,9 @@ import { openModal, closeModal } from '../../../actions/modal';
 import ModalRoot from '../components/modal_root';

 const mapStateToProps = state => ({
-<<<<<<< HEAD
-  type: state.getIn(['modal', 0, 'modalType'], null),
-  props: state.getIn(['modal', 0, 'modalProps'], {}),
-=======
  ignoreFocus: state.getIn(['modal', 'ignoreFocus']),
  type: state.getIn(['modal', 'stack', 0, 'modalType'], null),
  props: state.getIn(['modal', 'stack', 0, 'modalProps'], {}),
->>>>>>> v3.5.0rc1
 });

 const mapDispatchToProps = dispatch => ({
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -153,17 +153,6 @@ class SwitchingColumnsArea extends React.PureComponent {
          {redirect}
          <WrappedRoute path='/getting-started' component={GettingStarted} content={children} />
          <WrappedRoute path='/keyboard-shortcuts' component={KeyboardShortcuts} content={children} />
-<<<<<<< HEAD
-          <WrappedRoute path='/timelines/home' component={HomeTimeline} content={children} />
-          <WrappedRoute path='/timelines/public' exact component={PublicTimeline} content={children} />
-          <WrappedRoute path='/timelines/public/local' exact component={CommunityTimeline} content={children} />
-          <WrappedRoute path='/timelines/direct' component={DirectTimeline} content={children} />
-          <WrappedRoute path='/timelines/tag/:id' component={HashtagTimeline} content={children} />
-          <WrappedRoute path='/timelines/list/:id' component={ListTimeline} content={children} />
-
-          <WrappedRoute path='/notifications' component={Notifications} content={children} />
-          <WrappedRoute path='/favourites' component={FavouritedStatuses} content={children} />
-=======

          <WrappedRoute path={['/home', '/timelines/home']} component={HomeTimeline} content={children} />
          <WrappedRoute path={['/public', '/timelines/public']} exact component={PublicTimeline} content={children} />
@@ -174,17 +163,10 @@ class SwitchingColumnsArea extends React.PureComponent {
          <WrappedRoute path='/notifications' component={Notifications} content={children} />
          <WrappedRoute path='/favourites' component={FavouritedStatuses} content={children} />

->>>>>>> v3.5.0rc1
          <WrappedRoute path='/bookmarks' component={BookmarkedStatuses} content={children} />
          <WrappedRoute path='/pinned' component={PinnedStatuses} content={children} />

          <WrappedRoute path='/start' component={FollowRecommendations} content={children} />
-<<<<<<< HEAD
-          <WrappedRoute path='/search' component={Search} content={children} />
-          <WrappedRoute path='/directory' component={Directory} content={children} />
-
-          <WrappedRoute path='/statuses/new' component={Compose} content={children} />
-=======
          <WrappedRoute path='/directory' component={Directory} content={children} />
          <WrappedRoute path={['/explore', '/search']} component={Explore} content={children} />
          <WrappedRoute path={['/publish', '/statuses/new']} component={Compose} content={children} />
@@ -201,20 +183,10 @@ class SwitchingColumnsArea extends React.PureComponent {
          {/* Legacy routes, cannot be easily factored with other routes because they share a param name */}
          <WrappedRoute path='/timelines/tag/:id' component={HashtagTimeline} content={children} />
          <WrappedRoute path='/timelines/list/:id' component={ListTimeline} content={children} />
->>>>>>> v3.5.0rc1
          <WrappedRoute path='/statuses/:statusId' exact component={Status} content={children} />
          <WrappedRoute path='/statuses/:statusId/reblogs' component={Reblogs} content={children} />
          <WrappedRoute path='/statuses/:statusId/favourites' component={Favourites} content={children} />

-<<<<<<< HEAD
-          <WrappedRoute path='/accounts/:accountId' exact component={AccountTimeline} content={children} />
-          <WrappedRoute path='/accounts/:accountId/with_replies' component={AccountTimeline} content={children} componentParams={{ withReplies: true }} />
-          <WrappedRoute path='/accounts/:accountId/followers' component={Followers} content={children} />
-          <WrappedRoute path='/accounts/:accountId/following' component={Following} content={children} />
-          <WrappedRoute path='/accounts/:accountId/media' component={AccountGallery} content={children} />
-
-=======
->>>>>>> v3.5.0rc1
          <WrappedRoute path='/follow_requests' component={FollowRequests} content={children} />
          <WrappedRoute path='/blocks' component={Blocks} content={children} />
          <WrappedRoute path='/domain_blocks' component={DomainBlocks} content={children} />
--- a/app/javascript/mastodon/features/video/index.js
+++ b/app/javascript/mastodon/features/video/index.js
@@ -121,12 +121,8 @@ class Video extends React.PureComponent {
    autoPlay: PropTypes.bool,
    volume: PropTypes.number,
    muted: PropTypes.bool,
-<<<<<<< HEAD
    componetIndex: PropTypes.number,
    quote: PropTypes.bool,
-=======
-    componentIndex: PropTypes.number,
->>>>>>> v3.5.0rc1
  };

  static defaultProps = {
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -31,12 +31,8 @@
  "account.moved_to": "Uživatel {name} se přesunul na:",
  "account.mute": "Skrýt @{name}",
  "account.mute_notifications": "Skrýt oznámení od @{name}",
-<<<<<<< HEAD
-  "account.muted": "Účet skryt",
-  "account.never_active": "Nikdy",
-=======
  "account.muted": "Skryt",
->>>>>>> v3.5.0rc1
+  "account.never_active": "Nikdy",
  "account.posts": "Příspěvky",
  "account.posts_with_replies": "Příspěvky a odpovědi",
  "account.report": "Nahlásit @{name}",
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -311,21 +311,8 @@
  "navigation_bar.preferences": "Preferences",
  "navigation_bar.public_timeline": "Federated timeline",
  "navigation_bar.security": "Security",
-<<<<<<< HEAD
-  "navigation_bar.short.community_timeline": "LTL",
-  "navigation_bar.short.getting_started": "Started",
-  "navigation_bar.short.home": "Home",
-  "navigation_bar.short.lists": "Lists",
-  "navigation_bar.short.logout": "Logout",
-  "navigation_bar.short.notifications": "Notif.",
-  "navigation_bar.short.preferences": "Pref.",
-  "navigation_bar.short.public_timeline": "FTL",
-  "navigation_bar.short.search": "Search",
-  "notification.favourite": "{name} favourited your toot",
-=======
  "notification.admin.sign_up": "{name} signed up",
  "notification.favourite": "{name} favourited your post",
->>>>>>> v3.5.0rc1
  "notification.follow": "{name} followed you",
  "notification.follow_request": "{name} has requested to follow you",
  "notification.mention": "{name} mentioned you",
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -57,12 +57,8 @@
  "alert.rate_limited.title": "Forgalomkorlátozás",
  "alert.unexpected.message": "Váratlan hiba történt.",
  "alert.unexpected.title": "Hoppá!",
-<<<<<<< HEAD
-  "announcement.announcement": "Bejelentés",
-=======
  "announcement.announcement": "Közlemény",
  "attachments_list.unprocessed": "(feldolgozatlan)",
->>>>>>> v3.5.0rc1
  "autosuggest_hashtag.per_week": "{count} hetente",
  "boost_modal.combo": "Hogy átugord ezt következő alkalommal, használd {combo}",
  "bundle_column_error.body": "Valami hiba történt a komponens betöltése közben.",
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -317,26 +317,9 @@
  "navigation_bar.preferences": "ユーザー設定",
  "navigation_bar.public_timeline": "連合タイムライン",
  "navigation_bar.security": "セキュリティ",
-<<<<<<< HEAD
-  "notification.and_n_others": "and {count, plural, one {# other} other {# others}}",
-  "notification.and_n_others": "と、他 {count} 件",
  "navigation_bar.announcements": "運営からのお知らせ",
-  "navigation_bar.trends": "トレンド",
-  "navigation_bar.bookmarks": "ブックマーク",
-  "notification.favourite": "{name}さんがあなたの投稿に╰( ^o^)╮-=ﾆ=一＝三★しました",
-  "navigation_bar.short.community_timeline": "ローカル",
-  "navigation_bar.short.getting_started": "スタート",
-  "navigation_bar.short.home": "ホーム",
-  "navigation_bar.short.lists": "リスト",
-  "navigation_bar.short.logout": "ログアウト",
-  "navigation_bar.short.notifications": "通知",
-  "navigation_bar.short.preferences": "設定",
-  "navigation_bar.short.public_timeline": "連合",
-  "navigation_bar.short.search": "検索",
-=======
  "notification.admin.sign_up": "{name} がサインアップしました",
-  "notification.favourite": "{name}さんがあなたの投稿をお気に入りに登録しました",
->>>>>>> v3.5.0rc1
+  "notification.favourite": "{name}さんがあなたの投稿に╰( ^o^)╮-=ﾆ=一＝三★しました",
  "notification.follow": "{name}さんにフォローされました",
  "notification.follow_request": "{name} さんがあなたにフォローリクエストしました",
  "notification.mention": "{name}さんがあなたに返信しました",
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -351,7 +351,6 @@ export default function compose(state = initialState, action) {
        map.set('spoiler_text', '');
      }
    });
-<<<<<<< HEAD
  case COMPOSE_QUOTE:
    return state.withMutations(map => {
      map.set('in_reply_to', null);
@@ -385,8 +384,6 @@ export default function compose(state = initialState, action) {
      map.set('poll', null);
      map.set('idempotencyKey', uuid());
    });
-=======
->>>>>>> v3.5.0rc1
  case COMPOSE_SUBMIT_REQUEST:
    return state.set('is_submitting', true);
  case COMPOSE_UPLOAD_CHANGE_REQUEST:
--- a/app/javascript/mastodon/reducers/modal.js
+++ b/app/javascript/mastodon/reducers/modal.js
@@ -1,17 +1,5 @@
 import { MODAL_OPEN, MODAL_CLOSE } from '../actions/modal';
 import { TIMELINE_DELETE } from '../actions/timelines';
-<<<<<<< HEAD
-import { Stack as ImmutableStack, Map as ImmutableMap } from 'immutable';
-
-export default function modal(state = ImmutableStack(), action) {
-  switch(action.type) {
-  case MODAL_OPEN:
-        return state.unshift(ImmutableMap({ modalType: action.modalType, modalProps: action.modalProps }));
-  case MODAL_CLOSE:
-    return (action.modalType === undefined || action.modalType === state.getIn([0, 'modalType'])) ? state.shift() : state;
-  case TIMELINE_DELETE:
-        return state.filterNot((modal) => modal.get('modalProps').statusId === action.id);
-=======
 import { COMPOSE_UPLOAD_CHANGE_SUCCESS } from '../actions/compose';
 import { Stack as ImmutableStack, Map as ImmutableMap } from 'immutable';

@@ -45,7 +33,6 @@ export default function modal(state = initialState, action) {
    return popModal(state, { modalType: 'FOCAL_POINT', ignoreFocus: false });
  case TIMELINE_DELETE:
    return state.update('stack', stack => stack.filterNot((modal) => modal.get('modalProps').statusId === action.id));
->>>>>>> v3.5.0rc1
  default:
    return state;
  }