From ccce037f656be9ded9f805574949c06aea1f033a Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@ukr.net>
Date: Fri, 26 Apr 2019 11:50:43 +0300
Subject: Resolve the conflict

---
 po/ja.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'po/ja.po')

diff --git a/po/ja.po b/po/ja.po
index 67c2a98..c4e53cb 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -44,7 +44,7 @@ msgstr "mageiawelcome"
 
 #: mageiawelcome.py:73
 msgctxt "ConfList|"
-msgid "<b>Congratulations!</b><BR />You have are now running {}"
+msgid "<b>Congratulations!</b><BR />You are now running {}"
 msgstr "<b>おめでとうございます!</b><BR />あなたは現在 {} を実行中です"
 
 #: mageiawelcome.py:74
-- 
cgit v1.2.1