From 6306c9da275080761c6a1e209d1643320540e880 Mon Sep 17 00:00:00 2001
From: mhotar <mhotar@gmail.com>
Date: Sun, 14 Sep 2014 01:17:52 +0200
Subject: [PATCH] CZ translations - Radio

Conflicts:
	radio/src/translations/cz.h.txt
---
 radio/src/translations/cz.h.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt
index e7ae8dc3d..44ea255bc 100644
--- a/radio/src/translations/cz.h.txt
+++ b/radio/src/translations/cz.h.txt
@@ -80,7 +80,11 @@
 #define TR_TRNCHN              "CH1CH2CH3CH4"
 
 #define LEN_UART3MODES         "\017"
+<<<<<<< HEAD
 #define TR_UART3MODES          "VYP\0           ""S-Port Mirror\0 ""Telemetrie\0    ""Trainer\0       ""Debug\0         "
+=======
+#define TR_UART3MODES          "VYP\0           ""S-Port Mirror\0 ""Telemetrie\0    ""Debug\0         "
+>>>>>>> 2073a1f... CZ translations - Radio
 
 #define LEN_POTTYPES           "\017"
 #define TR_POTTYPES            "Není\0          ""Pot s aretací\0 ""Vícepol. přep.\0""Potenciometr\0"