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/da/da.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'help/mate-clock/da')

diff --git a/help/mate-clock/da/da.po b/help/mate-clock/da/da.po
index 904433e1..4c5bc98b 100644
--- a/help/mate-clock/da/da.po
+++ b/help/mate-clock/da/da.po
@@ -487,7 +487,7 @@ msgstr ""
 "For at konfigurere <application>Uret</application>, højreklikkes på "
 "panelprogrammet, og der vælges <guimenuitem>Indstillinger</guimenuitem>. Du "
 "vil blive præsenteret for tre faneblade hvor du kan ændre indstillinger for "
-"<guimenuitem>Generelt</guimenuitem>, <guimenuitem>Lokationer</guimenutiem> "
+"<guimenuitem>Generelt</guimenuitem>, <guimenuitem>Lokationer</guimenuitem> "
 "eller <guimenuitem>Vejret</guimenuitem>."
 
 #: ../C/clock.xml:331(title)
-- 
cgit v1.2.1