CloudToys/puyopuyotetr.is
1
0
Fork 0
Code

fix build, take 3

Browse Source
This commit is contained in:
Noa Himesaka 2023-11-11 23:02:04 +09:00
parent a197cb8a42
commit a9624f8ac1
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/javascript/mastodon/components/status_reactions.jsx
View File

@ -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 PropTypes from 'prop-types';
import React from 'react'; import React from 'react';
@ -29,7 +15,6 @@ import { assetHost } from '../utils/config';
import { AnimatedNumber } from './animated_number'; import { AnimatedNumber } from './animated_number';
>>>>>>> pr2462
export default class StatusReactions extends ImmutablePureComponent { export default class StatusReactions extends ImmutablePureComponent {
static propTypes = { static propTypes = {

5
app/javascript/mastodon/features/status/components/action_bar.jsx
View File

@ -24,13 +24,8 @@ import { WithRouterPropTypes } from 'mastodon/utils/react_router';
import { IconButton } from '../../../components/icon_button'; import { IconButton } from '../../../components/icon_button';
import DropdownMenuContainer from '../../../containers/dropdown_menu_container'; 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 { me, maxReactions } from '../../../initial_state';
import EmojiPickerDropdown from '../../compose/containers/emoji_picker_dropdown_container'; import EmojiPickerDropdown from '../../compose/containers/emoji_picker_dropdown_container';
>>>>>>> pr2462
const messages = defineMessages({ const messages = defineMessages({
delete: { id: 'status.delete', defaultMessage: 'Delete' }, delete: { id: 'status.delete', defaultMessage: 'Delete' },