From c0bce4f3b1b6fcb73ec2416495942a571198f28e Mon Sep 17 00:00:00 2001
From: tom5079 <tom5079@naver.com>
Date: Thu, 29 Aug 2019 11:43:20 +0900
Subject: [PATCH] Merge conflicts

---
 app/src/main/res/values-ja/strings.xml | 7 -------
 app/src/main/res/values-ko/strings.xml | 7 -------
 app/src/main/res/values/strings.xml    | 7 -------
 3 files changed, 21 deletions(-)

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index c4b5b587..f9356dd4 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -70,11 +70,7 @@
     <string name="settings_app_lock">アプリロック</string>
     <string name="settings_app_lock_type">アップロックの種類</string>
     <string name="settings_app_version_title">バージョン</string>
-<<<<<<< HEAD
     <string name="settings_lock_biometrics">生体認識</string>
-=======
-    <string name="settings_lock_biomatrics">生体認識</string>
->>>>>>> origin/development
     <string name="settings_lock_confirm">ロック確認のためもう一回入力してください。</string>
     <string name="settings_lock_enabled">有効</string>
     <string name="settings_lock_fingerprint">指紋</string>
@@ -103,10 +99,7 @@
     <string name="gallery_tags">タグ</string>
     <string name="gallery_thumbnails">サムネイル</string>
     <string name="gallery_related">おすすめ</string>
-<<<<<<< HEAD
     <string name="settings_nomedia_summary">イメージを隠す</string>
     <string name="settings_nomedia_title">イメージをギャラリーから見えなくする</string>
     <string name="reader_help">ヘルプ</string>
-=======
->>>>>>> origin/development
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 9418e1c7..6b01b3ee 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -70,11 +70,7 @@
     <string name="settings_app_lock">앱 잠금</string>
     <string name="settings_app_lock_type">앱 잠금 종류</string>
     <string name="settings_app_version_title">앱 버전</string>
-<<<<<<< HEAD
     <string name="settings_lock_biometrics">생체 인식</string>
-=======
-    <string name="settings_lock_biomatrics">생체 인식</string>
->>>>>>> origin/development
     <string name="settings_lock_confirm">잠금 확인을 위해 한번 더 입력해주세요</string>
     <string name="settings_lock_enabled">사용 중</string>
     <string name="settings_lock_fingerprint">지문</string>
@@ -103,10 +99,7 @@
     <string name="gallery_tags">태그</string>
     <string name="gallery_related">관련 갤러리</string>
     <string name="gallery_thumbnails">미리보기</string>
-<<<<<<< HEAD
     <string name="settings_nomedia_summary">이미지 숨기기</string>
     <string name="settings_nomedia_title">갤러리에서 이미지 검색이 되지 않도록 합니다</string>
     <string name="reader_help">도움말</string>
-=======
->>>>>>> origin/development
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d13f6044..40eb0bf9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -127,21 +127,14 @@
     <string name="settings_security_mode_summary">Enable security mode to make the screen invisible on recent app window</string>
     <string name="settings_dark_mode_title">Dark mode</string>
     <string name="settings_dark_mode_summary">Protect yourself against light attacks!</string>
-<<<<<<< HEAD
     <string name="settings_nomedia_title">Hide image from gallery</string>
     <string name="settings_nomedia_summary">Hides image from gallery</string>
-=======
->>>>>>> origin/development
 
     <string name="settings_lock_none">None</string>
     <string name="settings_lock_pattern">Pattern</string>
     <string name="settings_lock_pin" translatable="false">PIN</string>
     <string name="settings_lock_password">Password</string>
-<<<<<<< HEAD
     <string name="settings_lock_biometrics">Biometrics</string>
-=======
-    <string name="settings_lock_biomatrics">Biomatrics</string>
->>>>>>> origin/development
     <string name="settings_lock_fingerprint">Fingerprint</string>
     <string name="settings_lock_enabled">Enabled</string>
     <string name="settings_lock_confirm">Input same lock once more to confirm Lock</string>