merdge branch cwa-164

This commit is contained in:
Nadiia Hordenko 2020-02-07 20:28:58 +02:00
commit d247ec64e7

View file

@ -339,5 +339,9 @@
"incorrect_seed" : "입력하신 텍스트가 유효하지 않습니다.", "incorrect_seed" : "입력하신 텍스트가 유효하지 않습니다.",
"biometric_auth_reason" : "지문을 스캔하여 인증", "biometric_auth_reason" : "지문을 스캔하여 인증",
<<<<<<< HEAD
=======
>>>>>>> 4848485be8cbc34cbec847abbb76dabd075841ae
"version" : "버전 ${currentVersion}" "version" : "버전 ${currentVersion}"
} }