From e9f4cbccae5e9c4a4327cf88bb90c9910bacf419 Mon Sep 17 00:00:00 2001
From: Benjamin Bolling <benjaminbolling@ci0021286.esss.lu.se>
Date: Wed, 19 Feb 2020 12:00:19 +0100
Subject: [PATCH] target update from Johannes
---
.../collectedOPIs_01_Target.bob | 58 +++++++++++++++++++
1 file changed, 58 insertions(+)
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_Target.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_Target.bob
index dcb0acbf..f1626e3e 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_Target.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_Target.bob
@@ -1,15 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>Target</name>
+<<<<<<< HEAD
+ <macros>
+ <ROOT>$(ROOT)</ROOT>
+ </macros>
+ <width>2370</width>
+=======
<width>2350</width>
+>>>>>>> f55e053e8b5d8af3c42b27959d9deb9eaa497dcb
<height>1238</height>
<background_color>
<color name="BACKGROUND" red="220" green="225" blue="221">
</color>
</background_color>
<widget type="rectangle" version="2.0.0">
+<<<<<<< HEAD
+ <name>Rectangle_39</name>
+=======
<name>Rectangle_40</name>
<class></class>
+>>>>>>> f55e053e8b5d8af3c42b27959d9deb9eaa497dcb
<width>200</width>
<height>1238</height>
<line_width>0</line_width>
@@ -23,14 +34,58 @@
<tabs>
<tab>
<name>Overview</name>
+<<<<<<< HEAD
+ <file></file>
+=======
<file>collectedOPIs_01_targ_overview.bob</file>
+>>>>>>> f55e053e8b5d8af3c42b27959d9deb9eaa497dcb
<macros>
</macros>
<group_name></group_name>
</tab>
<tab>
+<<<<<<< HEAD
+ <name>THCCS</name>
+ <file>collectedOPIs_01_thccs.bob</file>
+ <macros>
+ </macros>
+ <group_name></group_name>
+ </tab>
+ <tab>
+ <name>TSSMS</name>
+ <file></file>
+ <macros>
+ </macros>
+ <group_name></group_name>
+ </tab>
+ <tab>
+ <name>Target Wheel System</name>
+ <file></file>
+ <macros>
+ </macros>
+ <group_name></group_name>
+ </tab>
+ <tab>
+ <name>Target Monitoring System</name>
+ <file></file>
+ <macros>
+ </macros>
+ <group_name></group_name>
+ </tab>
+ <tab>
+ <name>RGTCS</name>
+ <file></file>
+ <macros>
+ </macros>
+ <group_name></group_name>
+ </tab>
+ <tab>
+ <name>NBPI-NBOA CS</name>
+ <file></file>
+=======
<name>Helium Cooling Control</name>
<file>../../target-systems/thccs/thccs.bob</file>
+>>>>>>> f55e053e8b5d8af3c42b27959d9deb9eaa497dcb
<macros>
</macros>
<group_name></group_name>
@@ -49,6 +104,8 @@
<color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
</color>
</deselected_color>
+<<<<<<< HEAD
+=======
</widget>
<widget type="action_button" version="3.0.0">
<name>DetachButton</name>
@@ -84,5 +141,6 @@
<width>185</width>
<height>40</height>
<tooltip>$(actions)</tooltip>
+>>>>>>> f55e053e8b5d8af3c42b27959d9deb9eaa497dcb
</widget>
</display>
--
GitLab