slove-conflict

package.json

src/App.js

src/components/favorite_button/favorite_button.js

src/components/favorite_button/favorite_button.vue

src/components/post_status_form/post_status_form.js

src/components/post_status_form/post_status_form.vue

src/components/retweet_button/retweet_button.js

src/components/retweet_button/retweet_button.vue

src/components/status/status.vue

src/components/user_card_content/user_card_content.js

src/components/user_card_content/user_card_content.vue

src/components/user_settings/user_settings.vue

src/i18n/messages.js

src/main.js

src/modules/chat.js

static/emoji.json

yarn.lock