From 13a09ebb2b2a7ee487f9be1dae9409e0a0dad911 Mon Sep 17 00:00:00 2001
From: Kristina Jurisic <kristina.jurisic@esss.se>
Date: Mon, 28 Jun 2021 10:30:53 +0200
Subject: [PATCH] Solved merge conflicts

---
 solution/tc_project_app/GlobalTextList.TcGTLO | 27 ++-----------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/solution/tc_project_app/GlobalTextList.TcGTLO b/solution/tc_project_app/GlobalTextList.TcGTLO
index a031bc7..b3afeb5 100644
--- a/solution/tc_project_app/GlobalTextList.TcGTLO
+++ b/solution/tc_project_app/GlobalTextList.TcGTLO
@@ -11,14 +11,11 @@
               <l n="LanguageTexts" t="ArrayList" />
             </o>
             <o>
-
               <v n="TextID">"587"</v>
               <v n="TextDefault">"%1d"</v>
               <l n="LanguageTexts" t="ArrayList" />
             </o>
             <o>
-
-
               <v n="TextID">"951"</v>
               <v n="TextDefault">"%2.2f"</v>
               <l n="LanguageTexts" t="ArrayList" />
@@ -139,7 +136,6 @@
               <l n="LanguageTexts" t="ArrayList" />
             </o>
             <o>
-
               <v n="TextID">"485"</v>
               <v n="TextDefault">"bMovingExtend"</v>
               <l n="LanguageTexts" t="ArrayList" />
@@ -172,15 +168,11 @@
             <o>
               <v n="TextID">"933"</v>
               <v n="TextDefault">"bValveOn"</v>
-
-              <v n="TextID">"786"</v>
-              <v n="TextDefault">"Bwd Enable"</v>
               <l n="LanguageTexts" t="ArrayList" />
             </o>
             <o>
-              <v n="TextID">"571"</v>
-              <v n="TextDefault">"BWD Limit"</v>
-
+              <v n="TextID">"786"</v>
+              <v n="TextDefault">"Bwd Enable"</v>
               <l n="LanguageTexts" t="ArrayList" />
             </o>
             <o>
@@ -333,11 +325,6 @@
               <v n="TextDefault">"Fwd Enable"</v>
               <l n="LanguageTexts" t="ArrayList" />
             </o>
-            <o>
-              <v n="TextID">"737"</v>
-              <v n="TextDefault">"FWD Limit"</v>
-              <l n="LanguageTexts" t="ArrayList" />
-            </o>
             <o>
               <v n="TextID">"688"</v>
               <v n="TextDefault">"fWriteAxisParameter"</v>
@@ -399,7 +386,6 @@
               <l n="LanguageTexts" t="ArrayList" />
             </o>
             <o>
-
               <v n="TextID">"19"</v>
               <v n="TextDefault">"Limit switches simulation"</v>
               <l n="LanguageTexts" t="ArrayList" />
@@ -412,15 +398,6 @@
             <o>
               <v n="TextID">"459"</v>
               <v n="TextDefault">"LimitFwd"</v>
-
-              <v n="TextID">"167"</v>
-              <v n="TextDefault">"Limit Bwd"</v>
-              <l n="LanguageTexts" t="ArrayList" />
-            </o>
-            <o>
-              <v n="TextID">"11"</v>
-              <v n="TextDefault">"Limit Fwd"</v>
-
               <l n="LanguageTexts" t="ArrayList" />
             </o>
             <o>