From a9624f8ac11d0e07900b983d4c3661c1886328f5 Mon Sep 17 00:00:00 2001 From: Noa Himesaka Date: Sat, 11 Nov 2023 23:02:04 +0900 Subject: [PATCH] fix build, take 3 --- .../mastodon/components/status_reactions.jsx | 15 --------------- .../features/status/components/action_bar.jsx | 5 ----- 2 files changed, 20 deletions(-) diff --git a/app/javascript/mastodon/components/status_reactions.jsx b/app/javascript/mastodon/components/status_reactions.jsx index 34eb23ae6f..e3ae79958b 100644 --- a/app/javascript/mastodon/components/status_reactions.jsx +++ b/app/javascript/mastodon/components/status_reactions.jsx @@ -1,17 +1,3 @@ -<<<<<<< HEAD -import ImmutablePureComponent from 'react-immutable-pure-component'; -import PropTypes from 'prop-types'; -import ImmutablePropTypes from 'react-immutable-proptypes'; -import { autoPlayGif, reduceMotion } from '../initial_state'; -import spring from 'react-motion/lib/spring'; -import TransitionMotion from 'react-motion/lib/TransitionMotion'; -import classNames from 'classnames'; -import React from 'react'; -import { unicodeMapping } from '../features/emoji/emoji_unicode_mapping_light'; -import { AnimatedNumber } from './animated_number'; -import { assetHost } from '../utils/config'; - -======= import PropTypes from 'prop-types'; import React from 'react'; @@ -29,7 +15,6 @@ import { assetHost } from '../utils/config'; import { AnimatedNumber } from './animated_number'; ->>>>>>> pr2462 export default class StatusReactions extends ImmutablePureComponent { static propTypes = { diff --git a/app/javascript/mastodon/features/status/components/action_bar.jsx b/app/javascript/mastodon/features/status/components/action_bar.jsx index 9c4b5fa303..b30fdb096c 100644 --- a/app/javascript/mastodon/features/status/components/action_bar.jsx +++ b/app/javascript/mastodon/features/status/components/action_bar.jsx @@ -24,13 +24,8 @@ import { WithRouterPropTypes } from 'mastodon/utils/react_router'; import { IconButton } from '../../../components/icon_button'; import DropdownMenuContainer from '../../../containers/dropdown_menu_container'; -<<<<<<< HEAD -import EmojiPickerDropdown from '../../compose/containers/emoji_picker_dropdown_container'; -import { me, maxReactions } from '../../../initial_state'; -======= import { me, maxReactions } from '../../../initial_state'; import EmojiPickerDropdown from '../../compose/containers/emoji_picker_dropdown_container'; ->>>>>>> pr2462 const messages = defineMessages({ delete: { id: 'status.delete', defaultMessage: 'Delete' },