Whoops, forgot to clean up a conflict.

pull/528/head
David Yip 2018-06-03 02:35:54 -05:00
parent 3550470c18
commit 8343f56b2c
No known key found for this signature in database
GPG Key ID: 7DA0036508FCC0CC
1 changed files with 0 additions and 3 deletions

View File

@ -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}さんがあなたに返信しました",