From bcc8a11e05c9e1479e71d1696084e9e509fe2e92 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Sat, 27 Jun 2015 22:35:36 +0200
Subject: help: clock and fish: fix merge conflicts during build

---
 help/mate-clock/ko/ko.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'help/mate-clock/ko/ko.po')

diff --git a/help/mate-clock/ko/ko.po b/help/mate-clock/ko/ko.po
index 7511d2ab..f0177d26 100644
--- a/help/mate-clock/ko/ko.po
+++ b/help/mate-clock/ko/ko.po
@@ -298,7 +298,7 @@ msgid ""
 "Scroll down the list of items in the <guilabel>Add to Panel</guilabel> "
 "dialog, then select <guilabel>Clock</guilabel>."
 msgstr ""
-"<guilabel>패널에 더하기</guimenuitem> 대화 상자의 목록에서 스크롤창을 내려 "
+"<guilabel>패널에 더하기</guilabel> 대화 상자의 목록에서 스크롤창을 내려 "
 "<guilabel>시계</guilabel>를 선택하십시오."
 
 #: C/clock.xml:204(para)
-- 
cgit v1.2.1