From 8343f56b2c1d23f1c2c2c42515bae1d9a4119ff6 Mon Sep 17 00:00:00 2001 From: David Yip Date: Sun, 3 Jun 2018 02:35:54 -0500 Subject: [PATCH] Whoops, forgot to clean up a conflict. --- app/javascript/mastodon/locales/ja.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index 708ad2ca948..fc1a314e83e 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -176,11 +176,8 @@ "navigation_bar.pins": "固定したトゥート", "navigation_bar.preferences": "ユーザー設定", "navigation_bar.public_timeline": "連合タイムライン", -<<<<<<< HEAD "navigation_bar.misc": "その他", -======= "navigation_bar.security": "セキュリティ", ->>>>>>> origin/master "notification.favourite": "{name}さんがあなたのトゥートをお気に入りに登録しました", "notification.follow": "{name}さんにフォローされました", "notification.mention": "{name}さんがあなたに返信しました",