From f4f2f7408110b01b2abd32d5dc7d1bc2e1b1e67f Mon Sep 17 00:00:00 2001
From: Josh <joshms@trueos.org>
Date: Mon, 24 Jul 2017 10:44:00 -0400
Subject: Remove commit message from the translation file

There was a commit message in there.  Oops!
---
 src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_cs.ts | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_cs.ts')

diff --git a/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_cs.ts b/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_cs.ts
index 153d4962..365d477a 100644
--- a/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_cs.ts
+++ b/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_cs.ts
@@ -783,16 +783,12 @@ Nové umístění: %2</translation>
         <translation>Zobrazit tlačítka akcí</translation>
     </message>
     <message>
-<<<<<<< HEAD
         <location filename="../MainUI.ui" line="245"/>
         <source>Load Thumbnails</source>
         <translation>Načíst náhledy</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="253"/>
-=======
         <location filename="../MainUI.ui" line="254"/>
->>>>>>> 86f6fadf45c2b87749cffac82411d2371448da53
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
-- 
cgit