From 22ab646397e32f53f3119f81f75caf871629fe1b Mon Sep 17 00:00:00 2001
From: Darren Lines <darren@darrenlines.uk>
Date: Tue, 1 Mar 2022 20:10:47 +0000
Subject: [PATCH] Resolved conflicts

---
 tabs/pid_tuning.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tabs/pid_tuning.js b/tabs/pid_tuning.js
index 6f1c1e5f..c0f7b3e5 100644
--- a/tabs/pid_tuning.js
+++ b/tabs/pid_tuning.js
@@ -112,11 +112,6 @@ TABS.pid_tuning.initialize = function (callback) {
         // translate to user-selected language
         localize();
 
-        if (FC.isCdComponentUsed()) {
-            $('th.feedforward').html(chrome.i18n.getMessage('pidTuning_ControlDerivative'));
-            $('th.feedforward').attr('title', chrome.i18n.getMessage('pidTuning_ControlDerivative'));
-        }
-
         helper.tabs.init($('.tab-pid_tuning'));
         helper.features.updateUI($('.tab-pid_tuning'), FEATURES);