From b6a62dedaeb29c526bfc94ac8fb00ce34b11137a Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Fri, 27 Oct 2017 22:26:47 +0200
Subject: [PATCH] Fix merge conflict.

---
 app/src/main/res/values-ko/strings.xml | 32 +-------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index a0504dc51a..b755028e8d 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -648,7 +648,7 @@
     <string name="activate_profile">ACTIVATE PROFILE</string>
     <string name="date">Date</string>
     <string name="invalid">INVALID</string>
-<string name="waitingforpairing">펌프연동 대기중</string>
+    <string name="waitingforpairing">펌프연동 대기중</string>
     <string name="pairingok">연동완료</string>
     <string name="pairingtimedout">연동시간초과</string>
     <string name="pairing">연동중</string>
@@ -679,35 +679,5 @@
     <string name="reuse">재사용</string>
     <string name="wearcontrol_title">워치로 작동하기</string>
     <string name="wearcontrol_summary">임시목표와 관리입력을 워치로 설정합니다.</string>
-    <string name="connectiontimedout">연결시간초과</string>    <string name="waitingforpairing">펌프연동 대기중</string><string name="pairingok">연동완료</string>
-    <string name="pairingtimedout">연동시간초과</string>
-    <string name="pairing">연동중</string>
-    <string name="danars_nodeviceavailable">현재까지 발견된 기기가 없습니다.</string>
-    <string name="emptyreservoir">빈 주사기</string>
-    <string name="bloodsugarmeasurementalert">혈당측정알람</string>
-    <string name="remaininsulinalert">남은 인슐린 양</string>
-    <string name="danarspump">다나RS</string>
-    <string name="danarspump_shortname">Dana</string>
-    <string name="selectedpump">선택된 펌프</string>
-    <string name="pairpump">새 펌프와 연동</string>
-    <string name="bolusspeed">식사주입 속도</string>
-    <string name="danar_setbasalstep001">기초주입 단위를 0.01 U/h로 설정하세요</string>
-    <string name="serialnumber">시리얼번호</string>
-    <string name="careportal_newnstreatment_percentage_label">퍼센트</string>
-    <string name="careportal_newnstreatment_timeshift_label">시간 이동</string>
-    <string name="default_temptargets">임시목표 기본값</string>
-    <string name="eatingsoon_duration">eatingsoon 기간</string>
-    <string name="eatingsoon_target">eatingsoon 목표</string>
-    <string name="activity_duration">activity 기간</string>
-    <string name="activity_target">activity 목표</string>
-    <string name="danar_history_prime">교체</string>
-    <string name="gettingextendedbolusstatus">확장식사주입 상태 가져오는중</string>
-    <string name="gettingbolusstatus">식사주입상태 가져오는중</string>
-    <string name="gettingtempbasalstatus">임시기초주입상태 가져오는중</string>
-    <string name="gettingpumpsettings">펌프설정 가져오는중</string>
-    <string name="gettingpumptime">펌프시간 가져오는중</string>
-    <string name="reuse">재사용</string>
-    <string name="wearcontrol_title">워치로 작동하기</string>
-    <string name="wearcontrol_summary">임시목표와 관리입력을 워치로 설정합니다.</string>
     <string name="connectiontimedout">연결시간초과</string>
 </resources>