およ
Auto-merging app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
CONFLICT (content): Merge conflict in app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
<<<<<<< HEAD
alt=''
src={`${assetHost}/emoji/1f361.svg`}
/>
=======
alt=''
src={`${assetHost}/emoji/1f602.svg`}
/>}
>>>>>>> master
ダンゴにしたしなw