diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-06-03 02:35:54 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-06-03 02:35:54 -0500 |
| commit | 8343f56b2c1d23f1c2c2c42515bae1d9a4119ff6 (patch) | |
| tree | 1b5a71966a8558d7929491ac30da8c969f11866e /app/javascript | |
| parent | 3550470c18425e80a322e6fe56245c9ede3d0689 (diff) | |
Whoops, forgot to clean up a conflict.
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/mastodon/locales/ja.json | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index 708ad2ca9..fc1a314e8 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}さんがあなたに返信しました", |