From 778c67d58a951ab8919dcff7080b1573ff64c286 Mon Sep 17 00:00:00 2001 From: "ilia.gurielidze@autStand.com" Date: Tue, 8 Apr 2025 14:16:49 +0400 Subject: [PATCH] Changed gitignore to ignore all resource.json files --- .gitignore | 3 ++- .../page-config/resource.json | 23 ----------------- .../session-props/resource.json | 23 ----------------- .../Alt-Colours/Critical/resource.json | 22 ---------------- .../Alt-Colours/Diagnostic/resource.json | 22 ---------------- .../Alt-Colours/High/resource.json | 22 ---------------- .../Alt-Colours/Low/resource.json | 22 ---------------- .../Alt-Colours/Medium/resource.json | 22 ---------------- .../Alarms-Styles/Critical/resource.json | 22 ---------------- .../Alarms-Styles/Diagnostic/resource.json | 22 ---------------- .../Alarms-Styles/High/resource.json | 22 ---------------- .../Alarms-Styles/Low/resource.json | 22 ---------------- .../Alarms-Styles/Medium/resource.json | 22 ---------------- .../Alarms-Styles/NoAlarm-Black/resource.json | 22 ---------------- .../Alarms-Styles/NoAlarm/resource.json | 22 ---------------- .../Alarms-Styles/Shelved/resource.json | 22 ---------------- .../Alerts/alertButton/resource.json | 22 ---------------- .../Alerts/alertButtonSecondary/resource.json | 22 ---------------- .../Alerts/alertClose/resource.json | 22 ---------------- .../Alerts/alertMessage/resource.json | 22 ---------------- .../Alerts/alertTitle/resource.json | 22 ---------------- .../Alerts/states/error/resource.json | 22 ---------------- .../Alerts/states/errorBtn1/resource.json | 22 ---------------- .../Alerts/states/errorBtn2/resource.json | 22 ---------------- .../Alerts/states/info/resource.json | 22 ---------------- .../Alerts/states/infoBtn1/resource.json | 22 ---------------- .../Alerts/states/infoBtn2/resource.json | 22 ---------------- .../Alerts/states/success/resource.json | 22 ---------------- .../Alerts/states/successBtn1/resource.json | 22 ---------------- .../Alerts/states/successBtn2/resource.json | 22 ---------------- .../Alerts/states/warning/resource.json | 22 ---------------- .../Alerts/states/warningBtn1/resource.json | 22 ---------------- .../Alerts/states/warningBtn2/resource.json | 22 ---------------- .../Controller/resource.json | 22 ---------------- .../Grey-Background/resource.json | 22 ---------------- .../Main-Background/resource.json | 22 ---------------- .../Buttons/Button-Menu/resource.json | 22 ---------------- .../Buttons/Clear-Background/resource.json | 22 ---------------- .../style-classes/Buttons/PB_1/resource.json | 22 ---------------- .../DeviceManagerRows/resource.json | 22 ---------------- .../Device-Connected/resource.json | 22 ---------------- .../Device-Disconnected/resource.json | 22 ---------------- .../Dropdown/DropDownBox/resource.json | 22 ---------------- .../EstopActivated/resource.json | 22 ---------------- .../EstopActivated101/resource.json | 22 ---------------- .../EstopDeactivated/resource.json | 22 ---------------- .../EstopDeactivated100/resource.json | 22 ---------------- .../Framework/Card/Bold_Text/resource.json | 22 ---------------- .../Framework/Card/Card/resource.json | 22 ---------------- .../Card/Card_transparent/resource.json | 22 ---------------- .../Card/Data/value_error/resource.json | 22 ---------------- .../Card/Data/value_info/resource.json | 22 ---------------- .../Card/Data/value_off/resource.json | 22 ---------------- .../Card/Data/value_success/resource.json | 22 ---------------- .../Card/Data/value_warning/resource.json | 22 ---------------- .../Framework/Card/Embedded/resource.json | 22 ---------------- .../Card/Embedded_transparent/resource.json | 22 ---------------- .../Framework/Card/Item/resource.json | 22 ---------------- .../Framework/Card/Item_Border/resource.json | 22 ---------------- .../Framework/Card/Label/resource.json | 22 ---------------- .../Framework/Card/Row/resource.json | 22 ---------------- .../Framework/Card/Title/resource.json | 22 ---------------- .../Card/Title_transparent/resource.json | 22 ---------------- .../Framework/Card/Value/resource.json | 22 ---------------- .../Framework/Cards/Bold_Text/resource.json | 16 ------------ .../Framework/Cards/Card/resource.json | 22 ---------------- .../Framework/Cards/Embedded/resource.json | 22 ---------------- .../Framework/Cards/Item/resource.json | 16 ------------ .../Framework/Cards/Item_Border/resource.json | 16 ------------ .../Framework/Cards/Label/resource.json | 22 ---------------- .../Framework/Cards/Row/resource.json | 22 ---------------- .../Framework/Cards/Title/resource.json | 16 ------------ .../Framework/Cards/Value/resource.json | 22 ---------------- .../ColorPicker/Container/resource.json | 22 ---------------- .../Input/Button/Action_Button/resource.json | 22 ---------------- .../Action_Button_Disabled/resource.json | 22 ---------------- .../Button/Action_Button_Error/resource.json | 22 ---------------- .../Input/Button/Export_Button/resource.json | 22 ---------------- .../Input/Button/General_Button/resource.json | 22 ---------------- .../Button/Secondary_minimal/resource.json | 22 ---------------- .../style-classes/Labels/Label/resource.json | 22 ---------------- .../Labels/Label_1/resource.json | 22 ---------------- .../PopUp-Styles/InfoButton/resource.json | 22 ---------------- .../PopUp-Styles/InfoLabel/resource.json | 22 ---------------- .../Information-Device/resource.json | 22 ---------------- .../State-Styles/AAA-Style/resource.json | 22 ---------------- .../Alt-Background-Fill/State0/resource.json | 22 ---------------- .../Alt-Background-Fill/State1/resource.json | 22 ---------------- .../Alt-Background-Fill/State2/resource.json | 22 ---------------- .../Alt-Background-Fill/State3/resource.json | 22 ---------------- .../Alt-Background-Fill/State4/resource.json | 22 ---------------- .../Alt-Background-Fill/State5/resource.json | 22 ---------------- .../Background-Fill/State0/resource.json | 22 ---------------- .../Background-Fill/State1/resource.json | 22 ---------------- .../Background-Fill/State1_Alt/resource.json | 22 ---------------- .../Background-Fill/State2/resource.json | 22 ---------------- .../Background-Fill/State2_Alt/resource.json | 22 ---------------- .../Background-Fill/State3/resource.json | 22 ---------------- .../Background-Fill/State3_Alt/resource.json | 22 ---------------- .../Background-Fill/State4/resource.json | 22 ---------------- .../Background-Fill/State4_Alt/resource.json | 22 ---------------- .../Background-Fill/State5/resource.json | 22 ---------------- .../Background-Fill/State5_Alt/resource.json | 22 ---------------- .../Background-Fill/State6/resource.json | 22 ---------------- .../State-Styles/State0/resource.json | 22 ---------------- .../State-Styles/State1/resource.json | 22 ---------------- .../State-Styles/State101/resource.json | 22 ---------------- .../State-Styles/State102/resource.json | 22 ---------------- .../State-Styles/State103/resource.json | 22 ---------------- .../State-Styles/State104/resource.json | 22 ---------------- .../State-Styles/State105/resource.json | 22 ---------------- .../State-Styles/State106/resource.json | 22 ---------------- .../State-Styles/State2/resource.json | 22 ---------------- .../State-Styles/State201/resource.json | 22 ---------------- .../State-Styles/State202/resource.json | 22 ---------------- .../State-Styles/State203/resource.json | 22 ---------------- .../State-Styles/State204/resource.json | 22 ---------------- .../State-Styles/State205/resource.json | 22 ---------------- .../State-Styles/State3/resource.json | 22 ---------------- .../State-Styles/State4/resource.json | 22 ---------------- .../State-Styles/State5/resource.json | 22 ---------------- .../State-Styles/State6/resource.json | 22 ---------------- .../Text-Styles/Ariel-Bold-12pt/resource.json | 22 ---------------- .../Ariel-Bold-White-12pt/resource.json | 22 ---------------- .../Text-Styles/Controller/resource.json | 22 ---------------- .../Text-Styles/Docked-Buttons/resource.json | 22 ---------------- .../CenterAlign_with_Padding/resource.json | 22 ---------------- .../style-classes/Text/InfoText/resource.json | 22 ---------------- .../style-classes/Text/Label/resource.json | 22 ---------------- .../Text/LeftAlign_with_Padding/resource.json | 22 ---------------- .../RightAlign_with_Padding/resource.json | 22 ---------------- .../Text/TitleText/resource.json | 22 ---------------- .../Text/labelText/resource.json | 22 ---------------- .../stylesheet/resource.json | 22 ---------------- .../MAP-Home/resource.json | 24 ------------------ .../Area_Nav_Button/resource.json | 23 ----------------- .../Custom-Views/Nav_Button/resource.json | 23 ----------------- .../Detailed-Views/Entry Point/resource.json | 23 ----------------- .../Good Pull Chord/resource.json | 22 ---------------- .../Detailed-Views/MCM Button/resource.json | 24 ------------------ .../Detailed-Views/MCM Button/thumbnail.png | Bin 733 -> 775 bytes .../views/Detailed-Views/MCM Button/view.json | 2 +- .../resource.json | 23 ----------------- .../resource.json | 23 ----------------- .../MCM03 Non Con/resource.json | 23 ----------------- .../MCM03 Non Con/thumbnail.png | Bin 63549 -> 65575 bytes .../Detailed-Views/MCM04_Chutes/resource.json | 23 ----------------- .../resource.json | 23 ----------------- .../resource.json | 23 ----------------- .../Detailed-Views/MCM05_Chutes/resource.json | 23 ----------------- .../MCM06 Non Con/resource.json | 23 ----------------- .../Detailed-Views/MCM07 Bypass/resource.json | 23 ----------------- .../views/Detailed-Views/MTN6/resource.json | 23 ----------------- .../Selected-Symbol-Description/resource.json | 23 ----------------- .../Symbol-Filter-View/resource.json | 23 ----------------- .../Symbol-Icons-View/resource.json | 23 ----------------- .../SymbolLibraryMain/resource.json | 23 ----------------- .../ignition/event-scripts/resource.json | 16 ------------ .../ignition/global-props/resource.json | 16 ------------ .../script-python/my_fucns/resource.json | 24 ------------------ .../tags/tag_utilities/resource.json | 23 ----------------- .../script-python/AWS/build_url/resource.json | 22 ---------------- .../AWS/credentials/resource.json | 22 ---------------- .../AWS/wbsckt_abort/resource.json | 22 ---------------- .../AWS/web_socket/resource.json | 22 ---------------- .../AWS/web_socket_send/resource.json | 22 ---------------- .../page-config/resource.json | 22 ---------------- .../session-permissions/resource.json | 22 ---------------- .../session-props/resource.json | 22 ---------------- .../session-scripts/resource.json | 16 ------------ .../Alt-Colours/Critical/resource.json | 22 ---------------- .../Alt-Colours/Diagnostic/resource.json | 22 ---------------- .../Alt-Colours/High/resource.json | 22 ---------------- .../Alt-Colours/Low/resource.json | 22 ---------------- .../Alt-Colours/Medium/resource.json | 22 ---------------- .../Alarms-Styles/Critical/resource.json | 22 ---------------- .../Alarms-Styles/Diagnostic/resource.json | 22 ---------------- .../Alarms-Styles/High/resource.json | 22 ---------------- .../Alarms-Styles/Low/resource.json | 22 ---------------- .../Alarms-Styles/Medium/resource.json | 22 ---------------- .../Alarms-Styles/NoAlarm-Black/resource.json | 22 ---------------- .../Alarms-Styles/NoAlarm/resource.json | 22 ---------------- .../Alarms-Styles/Shelved/resource.json | 22 ---------------- .../Alerts/alertButton/resource.json | 22 ---------------- .../Alerts/alertButtonSecondary/resource.json | 22 ---------------- .../Alerts/alertClose/resource.json | 22 ---------------- .../Alerts/alertMessage/resource.json | 22 ---------------- .../Alerts/alertTitle/resource.json | 22 ---------------- .../Alerts/states/error/resource.json | 22 ---------------- .../Alerts/states/errorBtn1/resource.json | 22 ---------------- .../Alerts/states/errorBtn2/resource.json | 22 ---------------- .../Alerts/states/info/resource.json | 22 ---------------- .../Alerts/states/infoBtn1/resource.json | 22 ---------------- .../Alerts/states/infoBtn2/resource.json | 22 ---------------- .../Alerts/states/success/resource.json | 22 ---------------- .../Alerts/states/successBtn1/resource.json | 22 ---------------- .../Alerts/states/successBtn2/resource.json | 22 ---------------- .../Alerts/states/warning/resource.json | 22 ---------------- .../Alerts/states/warningBtn1/resource.json | 22 ---------------- .../Alerts/states/warningBtn2/resource.json | 22 ---------------- .../Controller/resource.json | 22 ---------------- .../Grey-Background/resource.json | 22 ---------------- .../Main-Background/resource.json | 22 ---------------- .../Buttons/Button-Menu/resource.json | 22 ---------------- .../Buttons/Clear-Background/resource.json | 22 ---------------- .../style-classes/Buttons/PB_1/resource.json | 22 ---------------- .../DeviceManagerRows/resource.json | 22 ---------------- .../Device-Connected/resource.json | 22 ---------------- .../Device-Disconnected/resource.json | 22 ---------------- .../Dropdown/DropDownBox/resource.json | 22 ---------------- .../EstopActivated/resource.json | 22 ---------------- .../EstopActivated101/resource.json | 22 ---------------- .../EstopDeactivated/resource.json | 22 ---------------- .../EstopDeactivated100/resource.json | 22 ---------------- .../Framework/Card/Bold_Text/resource.json | 22 ---------------- .../Framework/Card/Card/resource.json | 22 ---------------- .../Card/Card_transparent/resource.json | 22 ---------------- .../Card/Data/value_error/resource.json | 22 ---------------- .../Card/Data/value_info/resource.json | 22 ---------------- .../Card/Data/value_off/resource.json | 22 ---------------- .../Card/Data/value_success/resource.json | 22 ---------------- .../Card/Data/value_warning/resource.json | 22 ---------------- .../Framework/Card/Embedded/resource.json | 22 ---------------- .../Card/Embedded_transparent/resource.json | 22 ---------------- .../Framework/Card/Item/resource.json | 22 ---------------- .../Framework/Card/Item_Border/resource.json | 22 ---------------- .../Framework/Card/Label/resource.json | 22 ---------------- .../Framework/Card/Row/resource.json | 22 ---------------- .../Framework/Card/Title/resource.json | 22 ---------------- .../Card/Title_transparent/resource.json | 22 ---------------- .../Framework/Card/Value/resource.json | 22 ---------------- .../Framework/Cards/Bold_Text/resource.json | 16 ------------ .../Framework/Cards/Card/resource.json | 22 ---------------- .../Framework/Cards/Embedded/resource.json | 22 ---------------- .../Framework/Cards/Item/resource.json | 16 ------------ .../Framework/Cards/Item_Border/resource.json | 16 ------------ .../Framework/Cards/Label/resource.json | 22 ---------------- .../Framework/Cards/Row/resource.json | 22 ---------------- .../Framework/Cards/Title/resource.json | 16 ------------ .../Framework/Cards/Value/resource.json | 22 ---------------- .../ColorPicker/Container/resource.json | 22 ---------------- .../Input/Button/Action_Button/resource.json | 22 ---------------- .../Action_Button_Disabled/resource.json | 22 ---------------- .../Button/Action_Button_Error/resource.json | 22 ---------------- .../Input/Button/Export_Button/resource.json | 22 ---------------- .../Input/Button/General_Button/resource.json | 22 ---------------- .../Button/Secondary_minimal/resource.json | 22 ---------------- .../style-classes/Labels/Label/resource.json | 22 ---------------- .../Labels/Label_1/resource.json | 22 ---------------- .../PopUp-Styles/InfoButton/resource.json | 22 ---------------- .../PopUp-Styles/InfoLabel/resource.json | 22 ---------------- .../Information-Device/resource.json | 22 ---------------- .../State-Styles/AAA-Style/resource.json | 22 ---------------- .../Alt-Background-Fill/State0/resource.json | 22 ---------------- .../Alt-Background-Fill/State1/resource.json | 22 ---------------- .../Alt-Background-Fill/State2/resource.json | 22 ---------------- .../Alt-Background-Fill/State3/resource.json | 22 ---------------- .../Alt-Background-Fill/State4/resource.json | 22 ---------------- .../Alt-Background-Fill/State5/resource.json | 22 ---------------- .../Background-Fill/State0/resource.json | 22 ---------------- .../Background-Fill/State1/resource.json | 22 ---------------- .../Background-Fill/State1_Alt/resource.json | 22 ---------------- .../Background-Fill/State2/resource.json | 22 ---------------- .../Background-Fill/State2_Alt/resource.json | 22 ---------------- .../Background-Fill/State3/resource.json | 22 ---------------- .../Background-Fill/State3_Alt/resource.json | 22 ---------------- .../Background-Fill/State4/resource.json | 22 ---------------- .../Background-Fill/State4_Alt/resource.json | 22 ---------------- .../Background-Fill/State5/resource.json | 22 ---------------- .../Background-Fill/State5_Alt/resource.json | 22 ---------------- .../Background-Fill/State6/resource.json | 22 ---------------- .../State-Styles/State0/resource.json | 22 ---------------- .../State-Styles/State1/resource.json | 22 ---------------- .../State-Styles/State101/resource.json | 22 ---------------- .../State-Styles/State102/resource.json | 22 ---------------- .../State-Styles/State103/resource.json | 22 ---------------- .../State-Styles/State104/resource.json | 22 ---------------- .../State-Styles/State105/resource.json | 22 ---------------- .../State-Styles/State106/resource.json | 22 ---------------- .../State-Styles/State2/resource.json | 22 ---------------- .../State-Styles/State201/resource.json | 22 ---------------- .../State-Styles/State202/resource.json | 22 ---------------- .../State-Styles/State203/resource.json | 22 ---------------- .../State-Styles/State204/resource.json | 22 ---------------- .../State-Styles/State205/resource.json | 22 ---------------- .../State-Styles/State3/resource.json | 22 ---------------- .../State-Styles/State4/resource.json | 22 ---------------- .../State-Styles/State5/resource.json | 22 ---------------- .../State-Styles/State6/resource.json | 22 ---------------- .../Text-Styles/Ariel-Bold-12pt/resource.json | 22 ---------------- .../Ariel-Bold-White-12pt/resource.json | 22 ---------------- .../Text-Styles/Controller/resource.json | 22 ---------------- .../Text-Styles/Docked-Buttons/resource.json | 22 ---------------- .../CenterAlign_with_Padding/resource.json | 22 ---------------- .../style-classes/Text/InfoText/resource.json | 22 ---------------- .../style-classes/Text/Label/resource.json | 22 ---------------- .../Text/LeftAlign_with_Padding/resource.json | 22 ---------------- .../RightAlign_with_Padding/resource.json | 22 ---------------- .../Text/TitleText/resource.json | 22 ---------------- .../Text/labelText/resource.json | 22 ---------------- .../stylesheet/resource.json | 22 ---------------- .../MAP-Home/resource.json | 23 ----------------- .../Alarm-Views/AlarmTable/resource.json | 23 ----------------- .../Alarm-Views/Docked-Alarm/resource.json | 23 ----------------- .../HistoricalAlarms/resource.json | 23 ----------------- .../views/Alarm-Views/RealTime/resource.json | 23 ----------------- .../views/Alerts/alert/resource.json | 23 ----------------- .../views/Alerts/info-examples/resource.json | 23 ----------------- .../views/Custom-Views/Detail/resource.json | 23 ----------------- .../views/Detailed-Views/Detail/resource.json | 23 ----------------- .../Detailed-Views/Template/resource.json | 23 ----------------- .../views/Detailed-Views/Test/resource.json | 23 ----------------- .../Breakpoint Embedded/resource.json | 23 ----------------- .../views/Framework/Breakpoint/resource.json | 23 ----------------- .../Framework/Card/Card (1)/resource.json | 23 ----------------- .../views/Framework/Card/Card/resource.json | 23 ----------------- .../Card/Card_Collapsible/resource.json | 23 ----------------- .../resource.json | 23 ----------------- .../resource.json | 23 ----------------- .../Nested/Card_Collapsible/resource.json | 23 ----------------- .../resource.json | 23 ----------------- .../Color Picker/Color Picker/resource.json | 23 ----------------- .../Color Picker/Color/resource.json | 22 ---------------- .../views/Header/Header/resource.json | 23 ----------------- .../views/Main-Views/ATLAS/resource.json | 23 ----------------- .../CommandControl (OLD)/resource.json | 23 ----------------- .../Main-Views/CommandControl/resource.json | 23 ----------------- .../Commissioning Tool/CT_Main/resource.json | 23 ----------------- .../Commissioning Tool/Column/resource.json | 23 ----------------- .../Commissioning Tool/Message/resource.json | 23 ----------------- .../Commissioning Tool/Row/resource.json | 23 ----------------- .../SequenceTester/resource.json | 23 ----------------- .../Upload_files/resource.json | 23 ----------------- .../UserFeedBack/resource.json | 23 ----------------- .../AddDetailedViewMapping/resource.json | 23 ----------------- .../Config-Tool/AddDevice/resource.json | 23 ----------------- .../Config-Tool/MainView/resource.json | 23 ----------------- .../Config-Tool/SideMenu/resource.json | 23 ----------------- .../Config-Tool/TagViewer/resource.json | 23 ----------------- .../Device-Manager/Device/resource.json | 23 ----------------- .../DeviceManager/resource.json | 23 ----------------- .../DriverDropDown/resource.json | 23 ----------------- .../views/Main-Views/Help/resource.json | 23 ----------------- .../views/Main-Views/Home/resource.json | 23 ----------------- .../views/Main-Views/Monitron/resource.json | 23 ----------------- .../Notify-Tool/Notify-Main/resource.json | 23 ----------------- .../Main-Views/OilMonitoring/resource.json | 23 ----------------- .../views/Main-Views/S3/manage/resource.json | 23 ----------------- .../Main-Views/TempMonitoring/resource.json | 23 ----------------- .../views/Main-Views/ToolBox/resource.json | 23 ----------------- .../Docked-South/resource.json | 23 ----------------- .../Docked-West/resource.json | 23 ----------------- .../views/Navigation-Views/Key/resource.json | 23 ----------------- .../Navigation-Views/NavLabel/resource.json | 23 ----------------- .../Navigation-Views/Nav_Button/resource.json | 23 ----------------- .../NavigationButton/resource.json | 23 ----------------- .../PowerTable/ColumnSelection/resource.json | 23 ----------------- .../ColumnSelectionTile/resource.json | 23 ----------------- .../PowerTable/FilterMenuGroup/resource.json | 23 ----------------- .../PowerTable/FilterMenuItem/resource.json | 23 ----------------- .../PowerTable/FilterTile/resource.json | 22 ---------------- .../Input/Generic Numeric Input/resource.json | 23 ----------------- .../Generic Text Field Input/resource.json | 23 ----------------- .../Input/password_field/resource.json | 23 ----------------- .../Templates/Input/text_field/resource.json | 23 ----------------- .../TextInput_centerAlign/resource.json | 23 ----------------- .../Templates/Labels/label/resource.json | 23 ----------------- .../Labels/label_CenterAlign/resource.json | 23 ----------------- .../Labels/label_LeftAlign/resource.json | 23 ----------------- .../Labels/label_RightAlign/resource.json | 23 ----------------- .../Labels/label_legend/resource.json | 23 ----------------- .../S3/Audit/Log_Table/resource.json | 23 ----------------- .../S3/Audit/Query_Options/resource.json | 23 ----------------- .../S3/Management/copy/resource.json | 23 ----------------- .../S3/Management/file/resource.json | 23 ----------------- .../S3/Management/manage/resource.json | 23 ----------------- .../S3/Management/site/resource.json | 23 ----------------- .../S3/Versions/Log_Table/resource.json | 23 ----------------- .../S3/Versions/Query_Options/resource.json | 23 ----------------- .../Command-Authenticate/resource.json | 23 ----------------- .../Information-Docked-East/resource.json | 23 ----------------- .../Information/resource.json | 23 ----------------- .../Detail-View-Filter/resource.json | 23 ----------------- .../Device/Information-Device/resource.json | 23 ----------------- .../views/PopUp-Views/EditItem/resource.json | 23 ----------------- .../views/PopUp-Views/Error/resource.json | 23 ----------------- .../Legend-popup-view/resource.json | 23 ----------------- .../Legend_Popup/Legend-row/resource.json | 23 ----------------- .../Legend_Popup/Legend-table/resource.json | 23 ----------------- .../Notify-Popup-Entry/resource.json | 23 ----------------- .../Notify-Tool/Notify-Popup/resource.json | 23 ----------------- .../Notify-Submit-Popup/resource.json | 23 ----------------- .../Permissions Error/resource.json | 23 ----------------- .../S3/Audit/Log_Viewer/resource.json | 23 ----------------- .../S3/Versions/Log_Viewer/resource.json | 23 ----------------- .../views/PopUp-Views/Search/resource.json | 23 ----------------- .../views/PopUp-Views/UserInfo/resource.json | 23 ----------------- .../State-Views/State-Table/resource.json | 23 ----------------- .../CommandControl/resource.json | 23 ----------------- .../CommandControlActions/resource.json | 23 ----------------- .../CommandControlAlarms/resource.json | 23 ----------------- .../CommandControlStatus/resource.json | 23 ----------------- .../ControlCabinet/resource.json | 23 ----------------- .../ControllerStatus/resource.json | 23 ----------------- .../Device-Views/DeviceStatus/resource.json | 23 ----------------- .../DeviceStatus_old/resource.json | 23 ----------------- .../Device-Views/Estop/resource.json | 23 ----------------- .../Equipment-Views/ARSAW/resource.json | 23 ----------------- .../Equipment-Views/AUS/resource.json | 23 ----------------- .../Equipment-Views/Camera/resource.json | 23 ----------------- .../CognexCamera/resource.json | 23 ----------------- .../ControlCabinet/resource.json | 23 ----------------- .../Equipment-Views/Estop/resource.json | 23 ----------------- .../Equipment-Views/GoodsLift/resource.json | 23 ----------------- .../Equipment-Views/JAM/resource.json | 23 ----------------- .../Equipment-Views/Kobukuro/resource.json | 23 ----------------- .../Equipment-Views/Lift/resource.json | 23 ----------------- .../Light_Curtain/resource.json | 22 ---------------- .../Equipment-Views/Main_Panel/resource.json | 23 ----------------- .../Equipment-Views/Network/resource.json | 23 ----------------- .../Equipment-Views/PPI/resource.json | 23 ----------------- .../Photocell2_Lift/resource.json | 23 ----------------- .../Photocell_Lift/resource.json | 23 ----------------- .../PinDetection/resource.json | 23 ----------------- .../Equipment-Views/Pointer/resource.json | 23 ----------------- .../PressureSwitch/resource.json | 23 ----------------- .../Equipment-Views/PullChord/resource.json | 23 ----------------- .../PullChord_End/resource.json | 22 ---------------- .../PullChord_Line/resource.json | 22 ---------------- .../PullChord_Line_Vertical/resource.json | 22 ---------------- .../Equipment-Views/RFID/resource.json | 23 ----------------- .../Equipment-Views/Robot/resource.json | 23 ----------------- .../Equipment-Views/SLAMs/resource.json | 23 ----------------- .../Equipment-Views/SafetyGate/resource.json | 23 ----------------- .../Equipment-Views/SmartPac/resource.json | 23 ----------------- .../Equipment-Views/Spiral/resource.json | 23 ----------------- .../Stacker_Destacker/resource.json | 23 ----------------- .../Equipment-Views/Status/resource.json | 22 ---------------- .../StatusNonPowered/resource.json | 22 ---------------- .../StatusNonPowered_NS/resource.json | 22 ---------------- .../Equipment-Views/Status_NS/resource.json | 22 ---------------- .../Equipment-Views/THEA/resource.json | 23 ----------------- .../Equipment-Views/Test/resource.json | 23 ----------------- .../Selected-Symbol-Description/resource.json | 23 ----------------- .../Symbol-Filter-View/resource.json | 23 ----------------- .../Symbol-Icons-View/resource.json | 23 ----------------- .../Symbol-Information-View/resource.json | 23 ----------------- .../Symbol-Library-Views/Symbol/resource.json | 23 ----------------- .../SymbolLibraryMain/resource.json | 23 ----------------- .../views/Test/resource.json | 23 ----------------- .../client-tags/resource.json | 16 ------------ .../login-properties/resource.json | 16 ------------ .../Reset_Start_JamReset/resource.json | 17 ------------- .../StatusControl_Bar_Has_Role/resource.json | 17 ------------- .../ignition/event-scripts/resource.json | 16 ------------ .../ignition/global-props/resource.json | 16 ------------ .../GetHistoricalAlarms/resource.json | 16 ------------ .../script-python/AWS/build_url/resource.json | 23 ----------------- .../AWS/build_url_http/resource.json | 23 ----------------- .../AWS/create_tags/resource.json | 23 ----------------- .../AWS/credentials/resource.json | 23 ----------------- .../script-python/AWS/errors/resource.json | 24 ------------------ .../script-python/AWS/heartbeat/resource.json | 23 ----------------- .../AWS/message_types/resource.json | 23 ----------------- .../script-python/AWS/s3/resource.json | 24 ------------------ .../AWS/secrets_manager/resource.json | 24 ------------------ .../AWS/wbsckt_abort/resource.json | 23 ----------------- .../AWS/web_socket/resource.json | 23 ----------------- .../AWS/web_socket_send/resource.json | 22 ---------------- .../script-python/Alerts/resource.json | 23 ----------------- .../Commands/analytics/resource.json | 24 ------------------ .../Commands/button_commands/resource.json | 23 ----------------- .../Commands/shelve_alarms/resource.json | 23 ----------------- .../DocStringTemplate/resource.json | 23 ----------------- .../FileHandler/downloader/resource.json | 24 ------------------ .../FileHandler/uploader/resource.json | 24 ------------------ .../Gateway/timer_scripts/resource.json | 24 ------------------ .../Latency/CreateLatencyTags/resource.json | 24 ------------------ .../LatencyAvgCalculation/resource.json | 24 ------------------ .../Latency/LatencyCalculation/resource.json | 24 ------------------ .../Latency/WriteToDynamo/resource.json | 24 ------------------ .../script-python/SymbolLibrary/resource.json | 24 ------------------ .../Visualisation/home_page/resource.json | 24 ------------------ .../Visualisation/status/resource.json | 23 ----------------- .../Visualisation/status_2/resource.json | 23 ----------------- .../activityLog/logger/resource.json | 24 ------------------ .../activityLog/productMetrics/resource.json | 24 ------------------ .../alarms/alarm_count/resource.json | 23 ----------------- .../alarms/alarm_filters/resource.json | 23 ----------------- .../alarms/alarm_state/resource.json | 23 ----------------- .../alarms/alarm_tables/resource.json | 23 ----------------- .../script-python/alarms/shelve/resource.json | 23 ----------------- .../config/project_config/resource.json | 24 ------------------ .../script-python/helper/resource.json | 23 ----------------- .../import_file/csv/resource.json | 22 ---------------- .../script-python/loggerConfig/resource.json | 23 ----------------- .../messaging/message_handler/resource.json | 23 ----------------- .../navigation/additional_view/resource.json | 22 ---------------- .../navigation/alarm_navigation/resource.json | 22 ---------------- .../navigation/amzl_navigation/resource.json | 23 ----------------- .../navigation/basic_navigation/resource.json | 22 ---------------- .../navigation/navigate_to_page/resource.json | 23 ----------------- .../navigation/search/resource.json | 23 ----------------- .../navigation/show_alarms/resource.json | 22 ---------------- .../notifyTool/DeleteFromDynamo/resource.json | 24 ------------------ .../notifyTool/ReadFromDynamo/resource.json | 24 ------------------ .../notifyTool/WriteToDynamo/resource.json | 24 ------------------ .../script-python/row_builder/resource.json | 23 ----------------- .../state/state_tables/resource.json | 23 ----------------- .../tags/tag_utilities/resource.json | 23 ----------------- 510 files changed, 3 insertions(+), 11259 deletions(-) delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/page-config/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/session-props/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Critical/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Diagnostic/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/High/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Low/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Medium/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Critical/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Diagnostic/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/High/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Low/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Medium/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/NoAlarm-Black/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/NoAlarm/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Shelved/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertButton/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertButtonSecondary/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertClose/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertMessage/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertTitle/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/error/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/errorBtn1/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/errorBtn2/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/info/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/infoBtn1/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/infoBtn2/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/success/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/successBtn1/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/successBtn2/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/warning/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/warningBtn1/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/warningBtn2/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Background-Styles/Controller/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Background-Styles/Grey-Background/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Background-Styles/Main-Background/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Buttons/Button-Menu/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Buttons/Clear-Background/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Buttons/PB_1/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/DeviceManager/DeviceManagerRows/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Disconnects/Device-Connected/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Disconnects/Device-Disconnected/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Dropdown/DropDownBox/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopActivated/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopActivated101/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopDeactivated/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopDeactivated100/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Bold_Text/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Card/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Card_transparent/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_error/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_info/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_off/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_success/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_warning/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Embedded/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Embedded_transparent/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Item/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Item_Border/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Label/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Row/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Title/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Title_transparent/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Value/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Bold_Text/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Card/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Embedded/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Item/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Item_Border/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Label/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Row/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Title/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Value/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/ColorPicker/Container/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Input/Button/Action_Button/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Input/Button/Action_Button_Disabled/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Input/Button/Action_Button_Error/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Input/Button/Export_Button/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Input/Button/General_Button/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Input/Button/Secondary_minimal/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Labels/Label/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Labels/Label_1/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/PopUp-Styles/InfoButton/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/PopUp-Styles/InfoLabel/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/PopUp-Styles/Information-Device/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/AAA-Style/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State0/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State1/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State2/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State3/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State4/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State5/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State0/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State1/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State1_Alt/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State2/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State2_Alt/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State3/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State3_Alt/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State4/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State4_Alt/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State5/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State5_Alt/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State6/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State0/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State1/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State101/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State102/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State103/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State104/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State105/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State106/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State2/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State201/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State202/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State203/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State204/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State205/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State3/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State4/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State5/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State6/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text-Styles/Ariel-Bold-12pt/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text-Styles/Ariel-Bold-White-12pt/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text-Styles/Controller/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text-Styles/Docked-Buttons/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/CenterAlign_with_Padding/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/InfoText/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/Label/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/LeftAlign_with_Padding/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/RightAlign_with_Padding/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/TitleText/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/labelText/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/stylesheet/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/views/Additional-Home-View/MAP-Home/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/views/Custom-Views/Area_Nav_Button/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/views/Custom-Views/Nav_Button/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/Entry Point/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/Good Pull Chord/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM Button/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Fluid Inbound Merges 1-4/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Merges 5-7/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM03 Non Con/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM04_Chutes/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM04_South_Bulk_Inbound, Fluid Outbound and Problem Solve/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05 North Bulk Inbound, Fluid Outbound and Problem Solve/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05_Chutes/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM06 Non Con/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM07 Bypass/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MTN6/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Selected-Symbol-Description/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Symbol-Filter-View/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Symbol-Icons-View/resource.json delete mode 100644 MTN6_SCADA/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/SymbolLibraryMain/resource.json delete mode 100644 MTN6_SCADA/ignition/event-scripts/resource.json delete mode 100644 MTN6_SCADA/ignition/global-props/resource.json delete mode 100644 MTN6_SCADA/ignition/script-python/my_fucns/resource.json delete mode 100644 MTN6_SCADA/ignition/script-python/tags/tag_utilities/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/AMZL_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/build_url/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/AMZL_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/credentials/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/AMZL_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/wbsckt_abort/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/AMZL_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/web_socket/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/AMZL_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/web_socket_send/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/page-config/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/session-permissions/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/session-props/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/session-scripts/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Critical/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Diagnostic/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/High/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Low/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Medium/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Critical/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Diagnostic/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/High/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Low/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Medium/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/NoAlarm-Black/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/NoAlarm/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Shelved/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/alertButton/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/alertButtonSecondary/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/alertClose/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/alertMessage/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/alertTitle/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/error/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/errorBtn1/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/errorBtn2/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/info/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/infoBtn1/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/infoBtn2/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/success/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/successBtn1/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/successBtn2/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/warning/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/warningBtn1/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/warningBtn2/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Background-Styles/Controller/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Background-Styles/Grey-Background/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Background-Styles/Main-Background/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Buttons/Button-Menu/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Buttons/Clear-Background/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Buttons/PB_1/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/DeviceManager/DeviceManagerRows/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Disconnects/Device-Connected/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Disconnects/Device-Disconnected/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Dropdown/DropDownBox/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopActivated/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopActivated101/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopDeactivated/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopDeactivated100/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Bold_Text/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Card/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Card_transparent/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_error/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_info/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_off/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_success/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_warning/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Embedded/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Embedded_transparent/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Item/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Item_Border/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Label/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Row/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Title/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Title_transparent/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Value/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Bold_Text/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Card/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Embedded/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Item/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Item_Border/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Label/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Row/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Title/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Value/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/ColorPicker/Container/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Input/Button/Action_Button/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Input/Button/Action_Button_Disabled/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Input/Button/Action_Button_Error/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Input/Button/Export_Button/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Input/Button/General_Button/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Input/Button/Secondary_minimal/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Labels/Label/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Labels/Label_1/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/PopUp-Styles/InfoButton/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/PopUp-Styles/InfoLabel/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/PopUp-Styles/Information-Device/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/AAA-Style/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State0/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State1/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State2/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State3/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State4/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State5/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State0/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State1/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State1_Alt/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State2/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State2_Alt/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State3/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State3_Alt/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State4/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State4_Alt/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State5/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State5_Alt/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State6/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State0/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State1/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State101/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State102/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State103/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State104/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State105/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State106/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State2/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State201/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State202/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State203/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State204/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State205/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State3/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State4/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State5/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State6/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text-Styles/Ariel-Bold-12pt/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text-Styles/Ariel-Bold-White-12pt/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text-Styles/Controller/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text-Styles/Docked-Buttons/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/CenterAlign_with_Padding/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/InfoText/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/Label/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/LeftAlign_with_Padding/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/RightAlign_with_Padding/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/TitleText/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/labelText/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/stylesheet/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Additional-Home-View/MAP-Home/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alarm-Views/AlarmTable/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alarm-Views/Docked-Alarm/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alarm-Views/HistoricalAlarms/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alarm-Views/RealTime/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alerts/alert/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alerts/info-examples/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Custom-Views/Detail/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Detailed-Views/Detail/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Detailed-Views/Template/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Detailed-Views/Test/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Breakpoint Embedded/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Breakpoint/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Card (1)/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Card/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Card_Collapsible/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Card_Collapsible_Transparent/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Card_Collapsible_Transparent_with_Anchor/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Nested/Card_Collapsible/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Nested/Card_Collapsible_Transparent/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Color Picker/Color Picker/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Color Picker/Color/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Header/Header/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/ATLAS/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/CommandControl (OLD)/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/CommandControl/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/CT_Main/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/Column/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/Message/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/Row/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/SequenceTester/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/Upload_files/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/UserFeedBack/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Config-Tool/AddDetailedViewMapping/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Config-Tool/AddDevice/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Config-Tool/MainView/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Config-Tool/SideMenu/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Config-Tool/TagViewer/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Device-Manager/Device/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Device-Manager/DeviceManager/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Device-Manager/DriverDropDown/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Help/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Home/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Monitron/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Notify-Tool/Notify-Main/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/OilMonitoring/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/S3/manage/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/TempMonitoring/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/ToolBox/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Docked-South/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Docked-West/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Key/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/NavLabel/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Nav_Button/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/NavigationButton/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/PowerTable/ColumnSelection/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/PowerTable/ColumnSelectionTile/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/PowerTable/FilterMenuGroup/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/PowerTable/FilterMenuItem/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/PowerTable/FilterTile/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Input/Generic Numeric Input/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Input/Generic Text Field Input/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Input/password_field/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Input/text_field/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Labels/TextInput_centerAlign/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Labels/label/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Labels/label_CenterAlign/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Labels/label_LeftAlign/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Labels/label_RightAlign/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Labels/label_legend/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Audit/Log_Table/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Audit/Query_Options/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Management/copy/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Management/file/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Management/manage/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Management/site/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Versions/Log_Table/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Versions/Query_Options/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Command-Authenticate/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Device/Information-Device/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/EditItem/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Error/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Legend_Popup/Legend-popup-view/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Legend_Popup/Legend-row/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Legend_Popup/Legend-table/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Notify-Tool/Notify-Popup-Entry/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Notify-Tool/Notify-Popup/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Notify-Tool/Notify-Submit-Popup/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Permissions Error/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/S3/Audit/Log_Viewer/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/S3/Versions/Log_Viewer/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Search/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/UserInfo/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/State-Views/State-Table/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Controller-Views/CommandControl/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Controller-Views/CommandControlActions/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Controller-Views/CommandControlAlarms/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Controller-Views/CommandControlStatus/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Controller-Views/ControlCabinet/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Controller-Views/ControllerStatus/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Device-Views/DeviceStatus/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Device-Views/DeviceStatus_old/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Device-Views/Estop/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/ARSAW/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/AUS/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Camera/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/CognexCamera/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/ControlCabinet/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Estop/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/GoodsLift/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/JAM/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Kobukuro/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Lift/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Light_Curtain/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Main_Panel/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Network/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PPI/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Photocell2_Lift/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Photocell_Lift/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PinDetection/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Pointer/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PressureSwitch/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_End/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_Line/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_Line_Vertical/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/RFID/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Robot/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/SLAMs/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/SafetyGate/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/SmartPac/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Spiral/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Stacker_Destacker/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Status/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/StatusNonPowered/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/StatusNonPowered_NS/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Status_NS/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/THEA/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Test/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Selected-Symbol-Description/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Symbol-Filter-View/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Symbol-Icons-View/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Symbol-Information-View/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Symbol/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/SymbolLibraryMain/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Test/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.vision/client-tags/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.vision/login-properties/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.vision/templates/Site Specific/Reset_Start_JamReset/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.vision/templates/Site Specific/StatusControl_Bar_Has_Role/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/event-scripts/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/global-props/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/named-query/StoredProcedures/GetHistoricalAlarms/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/build_url/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/build_url_http/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/create_tags/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/credentials/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/errors/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/heartbeat/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/message_types/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/s3/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/secrets_manager/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/wbsckt_abort/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/web_socket/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/web_socket_send/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Alerts/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Commands/analytics/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Commands/button_commands/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Commands/shelve_alarms/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/DocStringTemplate/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/FileHandler/downloader/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/FileHandler/uploader/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Gateway/timer_scripts/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Latency/CreateLatencyTags/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Latency/LatencyAvgCalculation/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Latency/LatencyCalculation/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Latency/WriteToDynamo/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/SymbolLibrary/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Visualisation/home_page/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Visualisation/status/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Visualisation/status_2/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/activityLog/logger/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/activityLog/productMetrics/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/alarms/alarm_count/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/alarms/alarm_filters/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/alarms/alarm_state/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/alarms/alarm_tables/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/alarms/shelve/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/config/project_config/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/helper/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/import_file/csv/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/loggerConfig/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/messaging/message_handler/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/additional_view/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/alarm_navigation/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/amzl_navigation/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/basic_navigation/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/navigate_to_page/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/search/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/show_alarms/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/notifyTool/DeleteFromDynamo/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/notifyTool/ReadFromDynamo/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/notifyTool/WriteToDynamo/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/row_builder/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/state/state_tables/resource.json delete mode 100644 SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/tags/tag_utilities/resource.json diff --git a/.gitignore b/.gitignore index 8899872..b48313e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.resources/ \ No newline at end of file +.resources/ +**/resource.json \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/page-config/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/page-config/resource.json deleted file mode 100644 index ffaad6a..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/page-config/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "config.json" - ], - "attributes": { - "lastModification": { -<<<<<<< HEAD - "actor": "external", - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "fd032d60357cfd6af83ed10336d316a8c04c605db6b562408517680b16e3349e" -======= - "actor": "admin", - "timestamp": "2025-04-08T09:27:47Z" - }, - "lastModificationSignature": "6890ead9afacda3dd21d1a7c848f97e7f0002e2922ece8449621878e0aa58ee4" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/session-props/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/session-props/resource.json deleted file mode 100644 index 15711b3..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/session-props/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "props.json" - ], - "attributes": { - "lastModification": { -<<<<<<< HEAD - "actor": "external", - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "b0c2edad9416967d4e396616b7edf07c58e26d09de6b39d245bebe9218ce0928" -======= - "actor": "admin", - "timestamp": "2025-04-08T09:28:17Z" - }, - "lastModificationSignature": "aec710562d15836cc26d1572f9bc82451c91bb38a10720587b44366ef47124bc" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Critical/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Critical/resource.json deleted file mode 100644 index 8d29fde..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Critical/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "22a2ab06bc9ee87b140100835f2170adfc0ac29b81f9922aac213f8e1e76604e" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "eab9cbe16c832dbbb54701584553038a50a435c3f2c40cd6428d9a21f78c3448" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Diagnostic/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Diagnostic/resource.json deleted file mode 100644 index 06e5074..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Diagnostic/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "042c6fa18d1f98d941645b5b92dfb82d776bc85bc13d072330abbe56cba36ba5" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "83f26c834dbe18ee5c03f3bbd7bc20ccb9c021b1f449c3dfd48c3cd9457b5ce9" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/High/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/High/resource.json deleted file mode 100644 index cd1ba27..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/High/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "82af03b6048bd87e3d7f70d4d8614a21fbaceedea51b664cc05d4c83484675cf" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "1f308e3f17e806bb9d0c18b91b29105fd86a041c1d303d964da6560d3e0926c3" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Low/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Low/resource.json deleted file mode 100644 index 38430ab..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Low/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "373addd34413262c16f6c8ff8c230d509e953f055eb48ae1133246d23a486aaa" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "aff4f9e2df4969a2bf6328959e815eef8bec24ec2208b40fd6c30c75ea88c694" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Medium/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Medium/resource.json deleted file mode 100644 index e4ce3f9..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Medium/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "27b5681c2e2cdd7f292f97531eb2f9bd04dc62f364cf8bb190fd8e6ead5d32c8" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "6719beac1e2961b52f8ee92e1707f887e6c5d88e612ea10dfbe9ef4ac7fb3668" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Critical/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Critical/resource.json deleted file mode 100644 index 8d29fde..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Critical/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "22a2ab06bc9ee87b140100835f2170adfc0ac29b81f9922aac213f8e1e76604e" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "eab9cbe16c832dbbb54701584553038a50a435c3f2c40cd6428d9a21f78c3448" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Diagnostic/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Diagnostic/resource.json deleted file mode 100644 index 0b128bb..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Diagnostic/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "14702c7725ab81275a462df4b7184131f495a487898b94a53b1fecf877b3ad36" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "086b93b137d55e4bf5562c66f42a42a355926001ca906053c41999c38f266a98" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/High/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/High/resource.json deleted file mode 100644 index cd1ba27..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/High/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "82af03b6048bd87e3d7f70d4d8614a21fbaceedea51b664cc05d4c83484675cf" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "1f308e3f17e806bb9d0c18b91b29105fd86a041c1d303d964da6560d3e0926c3" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Low/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Low/resource.json deleted file mode 100644 index 3061c43..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Low/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "afe5169e6205d134bc233ddbaefc5d67cbb5db00c568d0427def87ed64fef6df" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "953f0bf6ec39b84459904d06ce9954c8b637c7c3f7c14232f1137d8608e6a16e" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Medium/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Medium/resource.json deleted file mode 100644 index 4341c4a..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Medium/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "a95fc36e1d9b5c9e97dd813156f1d79a81fde4b5b0a4afc1e16e3758d6794a62" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "f546ae2ff07b6385055219675d5379b9a96c1cc45fc12137579dfcb0b159c54b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/NoAlarm-Black/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/NoAlarm-Black/resource.json deleted file mode 100644 index 61d1661..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/NoAlarm-Black/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "6e28b92d666d1fd1cecbe8a437106bd0bada237b9914413656accc2867587c2a" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "4dbef54ec8fc29c5025eb79114830bf23500b5ccdd0264d192edf283a996b131" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/NoAlarm/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/NoAlarm/resource.json deleted file mode 100644 index 287d063..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/NoAlarm/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "9f35a2c236ba297966088aa004b2f424db7e330d96848ed6053ea02e9208858f" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "68c9774b39182e44396cebbd943ff69614073cdc1c614192d618173479d1d3e1" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Shelved/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Shelved/resource.json deleted file mode 100644 index b7b10f7..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Shelved/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "f819a00e80330d23448fc2bcd11355a6719ab9822d5caad74df674ca466c1a81" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "597b1d7abfabae5933ee5155c11a3109bd31c583764fae05237bf397831f3389" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertButton/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertButton/resource.json deleted file mode 100644 index e576884..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertButton/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "714396801aa350af6a85baffebed9f534017e8f3c5060e4efcea325d52ce0c78" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b3a828f40c06ba4f3b2ea7852db6dbba98c7c63f3af6395a43ae3f7b1966d27b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertButtonSecondary/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertButtonSecondary/resource.json deleted file mode 100644 index 291ae34..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertButtonSecondary/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "286ca9937f1cfc9af5d951a132d9a6e588ad24cc0019dd3ac0523329ae120581" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "1742fd6626c704c8171aa2650f1449e9495f4841c05b5b237763d5236c9dac6e" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertClose/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertClose/resource.json deleted file mode 100644 index ea2765f..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertClose/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "a75ced58af1e3560bc9e65edafa35f41b7a87550c6001151ebf91fa8303a99f9" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "89fa94ef1bdf1f8e05e2cb494eaa6789fff639673a89e806e3a4376b2368ba6d" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertMessage/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertMessage/resource.json deleted file mode 100644 index 0b68c47..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertMessage/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "189724954ee07f218e09db1b57c33710f2015f9be17e61eaa84d81b979ce0811" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "48f3c9eafcdffcdab435b1b72d828f3634bcc9f5fbb95c39fce8148845ff3419" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertTitle/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertTitle/resource.json deleted file mode 100644 index 9634011..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertTitle/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "1ed90dfa291f1c3edb53ce0ce5eb4d7dd512e6ed2612c97d6be6ac46c5982966" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "72bffb3daae503d7558cd29f56888838347b66f08e1a289f991d26c2e539c6a7" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/error/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/error/resource.json deleted file mode 100644 index 17cf99c..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/error/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "c322e368a924a03e1db915cb12ce8b6be9746f104847db0e2e7dbf98b9750161" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "d6a6cd7b51db473de34046cd6c57189b9504919bbbc28f406dabc8f7eaae98ce" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/errorBtn1/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/errorBtn1/resource.json deleted file mode 100644 index f8e34b9..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/errorBtn1/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "75f11fe8617da898bbf772ef3be3c274268328295eee226708b432ce736befd6" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "dfeda8574e0f90ad5ae4b44c0455b4029293b14b9d84949513af9c000459b0e8" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/errorBtn2/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/errorBtn2/resource.json deleted file mode 100644 index b452244..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/errorBtn2/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "9a10d14636ee2483a07b1c7fb46997b46b2ee4fa9b006fd6150e0b118b6ce23f" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "3a433791edd2d47f0a73b4a78f627a835c93cef6933c3f8e37c525fa28640fcf" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/info/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/info/resource.json deleted file mode 100644 index 94e1320..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/info/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "d1875a639422dd1115fceea9c64d93edcd76620e91b9bd37673c94ef4a054d99" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "abc31ca6aa3179f3224fbd126e8f5c07c62b1b0a83f5f0e65301fbf507f65d23" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/infoBtn1/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/infoBtn1/resource.json deleted file mode 100644 index bd323c2..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/infoBtn1/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "bd02477220c8eebeee7de8acfbf4f05d4b746478d6c2bc5580864556964dbbd8" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b440f4e40ef48d5a77d621ce3101094c3e499bc9676c67fc4df9faf814fbae35" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/infoBtn2/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/infoBtn2/resource.json deleted file mode 100644 index 43b89cf..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/infoBtn2/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "46dce566b4bb79d642bff6844c00866d37f5d1cec8c2c76943a7a988027e4d52" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "af159327f2d3303d712fe1d9e045451acc349d0f49c53288c14aee18c098e7ab" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/success/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/success/resource.json deleted file mode 100644 index e4d5e51..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/success/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "d00cedcbc1953061c721d09c2e5bd51c342eee33bf53cea1e8cfe37715feb3bf" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "81e0a1fe1cf955f91b3c3a251e82d556391386a2cd03f12be279accaa7f1cb22" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/successBtn1/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/successBtn1/resource.json deleted file mode 100644 index b6dcf4d..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/successBtn1/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "c7332e447dee5072a38671b5ea17e3d5a23a162cd05454859f2e9123a4396b51" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "55f79eb06c970e5ccc7f683a9f0fb2b6c6a5c2855ed65977640a61e047f8bb00" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/successBtn2/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/successBtn2/resource.json deleted file mode 100644 index 008d43e..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/successBtn2/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "5f2627dc73bb26221c15cc27779d84d6a03110e801f5882c293a24f1cfd5ec9a" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "c029a3e0079c7477837f5ce8bfda148bbcf4346cbcce34d9095455de9fe2649b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/warning/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/warning/resource.json deleted file mode 100644 index 31bbdb8..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/warning/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "b9e264e622c729dc46560cdb72ad94400af7d9c19b572a31290e047c72e14b94" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "623c6e17e07439732a1d761ffa7df85a0c68bd6c72d7c7a9dd6192e119594a4d" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/warningBtn1/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/warningBtn1/resource.json deleted file mode 100644 index 4010c6d..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/warningBtn1/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "dea0ffdfc5ee361b595ade35c7dbb6bff093e7fff59966c5797e469b038a41a4" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "8e4e279dff92dff9a9da86a244ef9dd9b3185c23c3b2c0b4af0edec44d4ba4ce" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/warningBtn2/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/warningBtn2/resource.json deleted file mode 100644 index dc1fcdd..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/states/warningBtn2/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "a871d1136ba8e68f553a57f33d4415fe020d7fe45fd2915a88734159525b2efd" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "41a078694d651728b12be9cca2f5579fc7dbab04dd9ee64ebf9383bf804fb2a1" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Background-Styles/Controller/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Background-Styles/Controller/resource.json deleted file mode 100644 index 6b6896a..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Background-Styles/Controller/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "a4c088fb7bf6c0d7e3946aca001f866bf632fe819363cf10e60a181f6202abe0" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "96c44e672b2413c49e068f2fe0cdc9d8b2cd0e36c604d353adb5cb7f999d3abb" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Background-Styles/Grey-Background/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Background-Styles/Grey-Background/resource.json deleted file mode 100644 index 671fb8b..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Background-Styles/Grey-Background/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "b304b3e1f72246aa07b7ab069eab38777941f095b5f8c4d10b351203e553ac36" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "2c7a56b7ed39584481201711814a1516a7dc3f6916b2eb8dcfdae1cddfaa7c46" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Background-Styles/Main-Background/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Background-Styles/Main-Background/resource.json deleted file mode 100644 index a5b9b5e..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Background-Styles/Main-Background/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "6e14df22ac8f79c41dccafb89011e84040e13a3fc7392d3a5f05753228d6fdb5" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "6065cc67ac7b28cc4c8795723e00140c70ffe9c08e15c036f5faa7499a96bfef" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Buttons/Button-Menu/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Buttons/Button-Menu/resource.json deleted file mode 100644 index 6b6896a..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Buttons/Button-Menu/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "a4c088fb7bf6c0d7e3946aca001f866bf632fe819363cf10e60a181f6202abe0" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "96c44e672b2413c49e068f2fe0cdc9d8b2cd0e36c604d353adb5cb7f999d3abb" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Buttons/Clear-Background/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Buttons/Clear-Background/resource.json deleted file mode 100644 index d9e3844..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Buttons/Clear-Background/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "8ee7bd4b79f6e41cc81bd8eb2e819f10ec44905b89557cd6d3368545ee57ffac" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "7953772c64e0080d92342a8ca287406ddebda3253b54c17dc9b32271828f98c3" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Buttons/PB_1/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Buttons/PB_1/resource.json deleted file mode 100644 index 77706b8..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Buttons/PB_1/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "55d9d987670e3070f2408eef07db16cf52541ecfb6adecee0eadb533d1861455" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "63cdf8d36e393c6a546c0a4d81c92a8b87a9d5e66ec3f9da5b2e5878971ec1ea" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/DeviceManager/DeviceManagerRows/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/DeviceManager/DeviceManagerRows/resource.json deleted file mode 100644 index 450802c..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/DeviceManager/DeviceManagerRows/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "55539c631e7951425e7e6297091f821e29a1e39dac3dcb68c9df19dcce69e6f8" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "7d0938951c48c8268df585bafcfef1d818c1b2f3ec99e335095aba3f84788189" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Disconnects/Device-Connected/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Disconnects/Device-Connected/resource.json deleted file mode 100644 index c8e8e62..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Disconnects/Device-Connected/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "f837ac77c45cacf2ef56006f966e64ec137a06592c02745634183e800775d673" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b7d65cf3bb8d19578cd6d1174391a14001cb3f7a5dd0aa514c1014fb535c9b71" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Disconnects/Device-Disconnected/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Disconnects/Device-Disconnected/resource.json deleted file mode 100644 index 0f56f06..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Disconnects/Device-Disconnected/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "19eefcbe9720bf5f6cf656bd5f976f7493bc331d4d8e786bd355f27036fe878e" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "769324b6f4ffeef8c25e6ad657dca34853732b06d78508960af6f5c4e616ec0b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Dropdown/DropDownBox/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Dropdown/DropDownBox/resource.json deleted file mode 100644 index 6e4f5c9..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Dropdown/DropDownBox/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "e8c75f6ed79770a060f8f1ad4329f51dd1c04c2d5ba82526f13442b7613d9e39" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b533d27339b0f078dc1d87ef14d64f686c5292d904623c079528a1095f3a518d" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopActivated/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopActivated/resource.json deleted file mode 100644 index 465914d..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopActivated/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "974459e9e8d2e121448944742ab262640694a2773f58244339b0f684201716e3" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "f284831b6f985179ae6f6a45da622272315b0d4080c0e52b60342837d803bb95" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopActivated101/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopActivated101/resource.json deleted file mode 100644 index c422199..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopActivated101/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "16dac38c467156f4b45af32d1ea0ebd68f8a279e4730c60dac0b973812a1ddd5" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "68b13f897068b96cd89b1fcfcec4ff67e8e8c2d8b4c232a354054d2218aeeddd" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopDeactivated/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopDeactivated/resource.json deleted file mode 100644 index d699fa4..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopDeactivated/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "43f944783897a56c92f3040458bd56d37e6b0e9177f7ed3b8ab918d4602e7e66" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "675563744d4acd29dc810d70f1a193131e178834f815c6de3ab804446d56fd1c" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopDeactivated100/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopDeactivated100/resource.json deleted file mode 100644 index bb3397f..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopDeactivated100/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "cb00f7719dae83d60057f95198e28fd01cf800509f5abeebecf477c4663e2112" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "3bbdf0340ddeca2515a694d2884c5b5ab5b808f6791337ef28a117a84f63f6b1" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Bold_Text/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Bold_Text/resource.json deleted file mode 100644 index fe41bec..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Bold_Text/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "91c56eab559428eb193b064af830125eb717db290fec32c134c1804ea3870151" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "fc53536f5db680a666b814e1b5fe24124510d555bcb8ef147c46fcd961353d3e" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Card/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Card/resource.json deleted file mode 100644 index fcd3f4d..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Card/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "1836331c3d7f2d5ba70b811f7f9b401c90a7bb21611f22ccefb3d59b8e278a5a" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "54a8840883fc968533de6c5d2aea9b67bd451f2c7a2c01154af2fdd57fca147a" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Card_transparent/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Card_transparent/resource.json deleted file mode 100644 index b7fe09a..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Card_transparent/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "040c04d5bc6d489b75d87573203efe5086780f17c58564eb52e4b22819b1c850" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "2c1558a3902e8c04cf8c4ea38c39d9b3742b3a9e6169a52d4ce8773ab79ddff5" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_error/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_error/resource.json deleted file mode 100644 index f9daa55..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_error/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "febcc73437355ffef2d1396a4a88fb037e10ce683884cf5ce55053fbd5a209d6" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "e13331c3b72d29b04fbf5ccff90f98c36af8c0d203c5cd1dc356741542833ae2" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_info/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_info/resource.json deleted file mode 100644 index ff3df4d..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_info/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "b475e8e1b8aa48bad8821dde8a8fe2584b8ed6d2205a6497e4d9f9d7ec888e97" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "8616c2922b7cbaf69b27cdc40a17c47a8ac5dae710e0c055126de3c0f78d65c8" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_off/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_off/resource.json deleted file mode 100644 index 9be9ba8..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_off/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "8af54cc404a9219334aea82b41b9cfaa0e178c93102e000d925e238e9efdcca8" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "607810e3d208ec39bfa9515d26ce4b2d238b668a3ed1a61df52f7c1cb8c1de63" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_success/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_success/resource.json deleted file mode 100644 index dc6b4e6..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_success/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "3976ef7e4df79e3f5cf65c80a05a87c1068847be4aaa5d4fc86e67c8472cb7eb" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "4b2bfacf276e7f33047cc58b94cecc338459859236fa1c70afb578a1c2f11617" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_warning/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_warning/resource.json deleted file mode 100644 index 9b904c9..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_warning/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "aeab00f511d394d3ebd34907a3a28cee590a3d60393345d4b0dccd24dc7240a2" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "2a32dea7c29e99ea89a440e87641254eba13065c50b13cc6d3da6973a401361d" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Embedded/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Embedded/resource.json deleted file mode 100644 index ade05dc..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Embedded/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "2415c6ef07fcff83403a114ed9127a2efeff86ac4ee34f85fb7fc59d29f5d5b9" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "de7172bc2c9952343fbdaf933be54f09115d6322a2abefb48388aa2ceed4a144" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Embedded_transparent/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Embedded_transparent/resource.json deleted file mode 100644 index 4b1356d..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Embedded_transparent/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "d700365a07f90c8452ffbda3c2f565737575a659c3bedf85fd694f16f110dff8" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "42d2f212c92264ab32e7c463ad53b61e5bbd595c8c32443d857d7ec539d452ba" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Item/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Item/resource.json deleted file mode 100644 index 1bc2c82..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Item/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "76734d73d0820a92af4a48baf2383779fea884daa9c9f84684d43639766b3b29" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "a12d6d781127a7498df097bdfa1afb7dda81d585a23aafb3e8146a2aebd72356" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Item_Border/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Item_Border/resource.json deleted file mode 100644 index f8505d2..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Item_Border/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "9d3cddb03d3006d0e7aa95626fd3cd9f67f5dcea4c31996aa0556e0ab05593a1" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "ceb68eb299a29dcbcd5743eedf003037247490d6a32dfad7e492515327fdae1a" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Label/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Label/resource.json deleted file mode 100644 index 0b453fa..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Label/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "4df86f33c002752f3ea2cf6dc0d5f08fc1f341cf44642f4993e0c92d00449543" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b9264694f3eac0cf63def2a8be38ed8e5fcde8b78faf941b8137154773045533" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Row/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Row/resource.json deleted file mode 100644 index c8d7b3c..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Row/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "cf70462781c5b67b1f5e41fd24c58ea868d84fd5a0a1ebd0b8823a8761f98862" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "16be2163c211658d9853c45e6c8d83834e40124f785ff0073f3a51013bc16a20" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Title/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Title/resource.json deleted file mode 100644 index a4ccd3f..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Title/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "b206ea44d0271fdce869a30c8a2e676ee8d0c4f7d441ba25e4ee1c20c59a8f97" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "e999b3390b2641f45b6c4681a1aebf932e85c346e06eb815fecbbb81bb7806da" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Title_transparent/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Title_transparent/resource.json deleted file mode 100644 index f1f0ca8..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Title_transparent/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "9a7939ceb7608e61e84ab871507f580c6cb44ae10a15d7c5da3cc293ead99c52" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "495a9df5ace18cff2b132cbd6bceb45dd14f8e7aefafe844080b05d3399ae176" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Value/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Value/resource.json deleted file mode 100644 index 37093a9..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Card/Value/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "dd8f09686f5d513a2e4590594c4c5b3c75bd25ae06116c7b7aca9e950ea122aa" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "91cb9292a4986c4c724cf3a949c651107c782c78020e47d1f1ab45a9bfa8f667" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Bold_Text/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Bold_Text/resource.json deleted file mode 100644 index 3f546a2..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Bold_Text/resource.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "data.bin" - ], - "attributes": { - "lastModification": { - "actor": "admin", - "timestamp": "2025-04-03T08:22:18Z" - }, - "lastModificationSignature": "fe1a59a9487ad1391b891f9b59e6fa2ea1fa226774fcc48e7d08bded6155b1ec" - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Card/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Card/resource.json deleted file mode 100644 index d5dad4e..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Card/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "4404ee2b043a5d217b9aece32c91278f4fc9cedcf4f9c0c4afec52e2b6f77c03" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "ed1c3f6b9290025ba16d620902f6641109c1b9e0ef7cfb13e4db23159bab8282" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Embedded/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Embedded/resource.json deleted file mode 100644 index ade05dc..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Embedded/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "2415c6ef07fcff83403a114ed9127a2efeff86ac4ee34f85fb7fc59d29f5d5b9" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "de7172bc2c9952343fbdaf933be54f09115d6322a2abefb48388aa2ceed4a144" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Item/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Item/resource.json deleted file mode 100644 index 361a0a1..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Item/resource.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "data.bin" - ], - "attributes": { - "lastModification": { - "actor": "admin", - "timestamp": "2025-04-03T08:22:18Z" - }, - "lastModificationSignature": "2779fe1c4dd30df1c931d97877209ca680fa7c7887891e80cc6bfbcde4bd2e97" - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Item_Border/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Item_Border/resource.json deleted file mode 100644 index 80453a2..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Item_Border/resource.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "data.bin" - ], - "attributes": { - "lastModification": { - "actor": "admin", - "timestamp": "2025-04-03T08:22:18Z" - }, - "lastModificationSignature": "073e7d75a970512e15ccab2135212bd99ad88c45711cc2d035186cf876c30b4f" - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Label/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Label/resource.json deleted file mode 100644 index e137b69..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Label/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "4327c17f72f02b15ba7d4e397c919b2a8559b0197c88090b6aa07391152766ef" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "1042c756d2aae3bbedf278beb831ce4a6dd545608c101c7ed864ec730aae41b3" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Row/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Row/resource.json deleted file mode 100644 index c8d7b3c..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Row/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "cf70462781c5b67b1f5e41fd24c58ea868d84fd5a0a1ebd0b8823a8761f98862" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "16be2163c211658d9853c45e6c8d83834e40124f785ff0073f3a51013bc16a20" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Title/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Title/resource.json deleted file mode 100644 index 219e45c..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Title/resource.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "data.bin" - ], - "attributes": { - "lastModification": { - "actor": "admin", - "timestamp": "2025-04-03T08:22:18Z" - }, - "lastModificationSignature": "f70c3b2815df0f4b858d521ccccd2e7b579829658f878a756f4c7961ae30e9e2" - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Value/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Value/resource.json deleted file mode 100644 index e0b31fa..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/Cards/Value/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "6d7beda4963a3bc27e85d5f1818d7812c4cfbda507e53df164074ad2db46be8e" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "f964d10e26fb741813855883de15a2c187a5f346a02a01e679a3b5761de54003" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/ColorPicker/Container/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/ColorPicker/Container/resource.json deleted file mode 100644 index 013715a..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Framework/ColorPicker/Container/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "0c7413318d401b25db20622e217b968784ab299993d4fd7dbd06b2d975596e77" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "443c3f8a985799f9827d5f5dcf894dde72f73656bcc720a99b454194e2e33f0d" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Input/Button/Action_Button/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Input/Button/Action_Button/resource.json deleted file mode 100644 index b718868..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Input/Button/Action_Button/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "fe0b39eb46c8c0c8452c24e8bfac00d85eec54ab5c73f5bac0060ce1c634ba60" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "f7406832b95930419f80fc8bb87232ed6cfcc16ff7e2add345abc43dce680daa" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Input/Button/Action_Button_Disabled/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Input/Button/Action_Button_Disabled/resource.json deleted file mode 100644 index 0498d53..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Input/Button/Action_Button_Disabled/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "716e1d219d5bb14739872bf5872a991b095023ebbf310c62dd8a268c9e1544b8" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "ba250af82e9ff6b534d42def4416fc462e8256d1877c72525a1fd2346cdf4355" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Input/Button/Action_Button_Error/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Input/Button/Action_Button_Error/resource.json deleted file mode 100644 index 571d512..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Input/Button/Action_Button_Error/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "05a4e3bad372437b2537aa7b5e3f61c9dc85620a1c5267f3d51be67575883d6f" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "353d1f6e895a7614b12443524ee28df72bc3cf2d0faf33d5dab7bf3604400713" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Input/Button/Export_Button/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Input/Button/Export_Button/resource.json deleted file mode 100644 index 00ab713..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Input/Button/Export_Button/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "07db31e2bd3f407a5d8cd985ae0132c211b75d1d0202eb4b6e92d6e86137e6ad" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "56eefabc2c08a65f1e6a9ca639583b47f9e3ef72c8e79c4f0120d93ce3668adf" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Input/Button/General_Button/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Input/Button/General_Button/resource.json deleted file mode 100644 index 00ab713..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Input/Button/General_Button/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "07db31e2bd3f407a5d8cd985ae0132c211b75d1d0202eb4b6e92d6e86137e6ad" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "56eefabc2c08a65f1e6a9ca639583b47f9e3ef72c8e79c4f0120d93ce3668adf" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Input/Button/Secondary_minimal/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Input/Button/Secondary_minimal/resource.json deleted file mode 100644 index 9e1c102..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Input/Button/Secondary_minimal/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "33ab8342d1f6fd414a6cfba0ec7f42389b5f266e1c35e900005639b4534801b3" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "14e2664998fce713f5eb781e239bafb64e055944bf89c5c06008b52ce68ee315" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Labels/Label/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Labels/Label/resource.json deleted file mode 100644 index 6d709b4..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Labels/Label/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "eeb0f47ce0b296f4cf37d230673c7da533aa93842ba8886d58a724cf7e7e193e" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "4537a8ffb735fdfde7ca2ed392f2d8b5242f175ad0592654014a138098c1365d" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Labels/Label_1/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Labels/Label_1/resource.json deleted file mode 100644 index 1d65f10..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Labels/Label_1/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "4bf87224975b175b180cc625ebcbd287ae105f286d3982563985d35e83fd5092" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "d71c4bc53b1ad816b63dc88de7678244ff70c504c9feb1428366dd6b2fbe35e4" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/PopUp-Styles/InfoButton/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/PopUp-Styles/InfoButton/resource.json deleted file mode 100644 index 1d613ef..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/PopUp-Styles/InfoButton/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "0359baf0953f470bfe754aaa651b9d0d8eee5c171775407e5361ed6b2bf7264f" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "696a34b42a46f5c8877d88770077a0002dc40423710ef088b5dd70bd88029b67" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/PopUp-Styles/InfoLabel/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/PopUp-Styles/InfoLabel/resource.json deleted file mode 100644 index e040845..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/PopUp-Styles/InfoLabel/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "cf83ae8c01c91cc7d25377875ae8b5b6939140ea83c620348730fd3b718d56aa" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "763ca54255054b405500b5e9821fed68e7c15d6606c8e41dbaee255ae5f60ec6" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/PopUp-Styles/Information-Device/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/PopUp-Styles/Information-Device/resource.json deleted file mode 100644 index 2059519..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/PopUp-Styles/Information-Device/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "6accd9d18f40d9a1e3e73319aa8ae3d89dd5a4cc61e07d9665c903438507893f" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "c6d565f6d9d7e1486a3a23af50404ffb8f957a17cc43ef1880c4ea141a566e5a" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/AAA-Style/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/AAA-Style/resource.json deleted file mode 100644 index d785bf3..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/AAA-Style/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "19577f7ebc22743bf08b05bc14a2102c8bcc5215eb17bb20251543e7facfd1d2" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "89b67366db982d45417263469dc6ebb4754ed735d81c8b2e988bf8ae48781889" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State0/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State0/resource.json deleted file mode 100644 index f5ca3f2..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State0/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "82af8e05410881086cf4682cd97e07a80bf057f6693e28deb733e580fd7c7a1d" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "1138a2feb5d9b21d97cd71085ef2edb7d9aa9dc470f241b6c62c5a1e43ef6578" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State1/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State1/resource.json deleted file mode 100644 index 879e793..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State1/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "bea4cf807431b794039a981a4da353124ea3d8b57bb368802fc51fc7331408ea" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "97213fa1880be55f9e65379a77f9c3ade2a645216c3d6176ad0ccb484061add3" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State2/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State2/resource.json deleted file mode 100644 index f391288..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State2/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "49912130a378b6780fd21694baa30a3392bbe9d808fb68722cb50bc0bcea6204" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "c1063b49f652d9d808153be13a2fe57bbb7228901b3171dee3d6a270c2b80f2b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State3/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State3/resource.json deleted file mode 100644 index 7240030..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State3/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "e29f696b4dd9714f4799a9f6eebe918a1dbf892f6f0ee8a583a73ad51ec7e377" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "944a41a1f530c1aac938bc43b0fca6c5a8594a4cff6c077b98fde42cbf7f2f54" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State4/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State4/resource.json deleted file mode 100644 index 36853e7..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State4/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "5eb8dc7797cdad8d0075089d1cfb8c50f3affcfdd183743135b9e38f96770d53" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b3a4a6aa45796677b6dea5e14795b20451532ba247959c34a32fc0ed8394feaf" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State5/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State5/resource.json deleted file mode 100644 index cb4266f..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State5/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "315acc11c701143c651ee5435b70724cd33cc672c5036739f89e9a47bfad2652" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "ca633d5a182556c28f58d6cf0a75a8d876d7ed2f4bfd5ad4fab3eb435e6ee1c0" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State0/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State0/resource.json deleted file mode 100644 index f5ca3f2..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State0/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "82af8e05410881086cf4682cd97e07a80bf057f6693e28deb733e580fd7c7a1d" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "1138a2feb5d9b21d97cd71085ef2edb7d9aa9dc470f241b6c62c5a1e43ef6578" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State1/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State1/resource.json deleted file mode 100644 index 879e793..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State1/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "bea4cf807431b794039a981a4da353124ea3d8b57bb368802fc51fc7331408ea" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "97213fa1880be55f9e65379a77f9c3ade2a645216c3d6176ad0ccb484061add3" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State1_Alt/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State1_Alt/resource.json deleted file mode 100644 index 879e793..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State1_Alt/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "bea4cf807431b794039a981a4da353124ea3d8b57bb368802fc51fc7331408ea" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "97213fa1880be55f9e65379a77f9c3ade2a645216c3d6176ad0ccb484061add3" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State2/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State2/resource.json deleted file mode 100644 index 8405988..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State2/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "a2f36f5edcce1277ff91dafe373a22b54a953c980469ce73928488437cb13e69" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "9e3d3622f6b6fe94c8673adce6e4d444cad3fa13dec3b40df0878aa05b99bca2" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State2_Alt/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State2_Alt/resource.json deleted file mode 100644 index f4e7ed8..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State2_Alt/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "fc028baef4a64a74f4a7cd4c660d14d2461a891971fb83a46d9656daaecf4e1a" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "8fca873cb4d4c3767f381d6839838c584c222d2893f96aad46a35217321396db" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State3/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State3/resource.json deleted file mode 100644 index 7da7d99..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State3/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "4c9419856c32a6a6667a954d2388b454d49218e510cb4ecd3239ca49fb1a2a69" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "69c1fde28be64b19007ecdc276586b630bf0f5498cb27bf06b78d9b21ce57192" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State3_Alt/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State3_Alt/resource.json deleted file mode 100644 index 753b0bb..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State3_Alt/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "743892b7ae5de00ce1dd53b226e272d0fe3cf2bab8772b058ba6631558b65e62" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "9e6d2f6685262b291f79fdba9fe4050fc6dd3f2a4534bc3e3d4b50a0985f83db" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State4/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State4/resource.json deleted file mode 100644 index cb4266f..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State4/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "315acc11c701143c651ee5435b70724cd33cc672c5036739f89e9a47bfad2652" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "ca633d5a182556c28f58d6cf0a75a8d876d7ed2f4bfd5ad4fab3eb435e6ee1c0" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State4_Alt/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State4_Alt/resource.json deleted file mode 100644 index d269168..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State4_Alt/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "4023554c82a104bbf91f83665d8b30a87d99b2e0766cc79db97d1ac669774aa6" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "2126e88ce57230ffd398a422a763ee37d8bc178f8d3e6218bb3d10dc1f94da5a" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State5/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State5/resource.json deleted file mode 100644 index 21a368d..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State5/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "c983955ceb615cc543e192e19cc26acfe8d881649af53e189e60c3e0d64bd184" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "55168d27b34a758e38bfe4133eaf3462ea88879866575a15ea7451ce93103905" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State5_Alt/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State5_Alt/resource.json deleted file mode 100644 index 87addcf..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State5_Alt/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "fc7eb7cfc7098d19eb7c3cea351cc311c8a3a0eb4b09e5176300969bda799b33" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "1bb886dfdc12b37ac679e6a797f4fe85d570e57fc38dff863671773e206ba4b5" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State6/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State6/resource.json deleted file mode 100644 index 79a73dc..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State6/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "8a7c54b4193d14765edf5b972e0715d42f39710b636c3e5f2dc1532596d2c233" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "7f59f3595a0b0516ebb83eb153cb669633751c7a41802af54d69d01e3a17e5e4" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State0/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State0/resource.json deleted file mode 100644 index 06e653f..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State0/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "2fc5001ba6d89e1d43a00d4f43d896996227007e606570958452e724491a7e69" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b4d86ec059286aa013918364e5dcfb0260b1f80d2c0919a6ab4e3ab3910c6146" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State1/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State1/resource.json deleted file mode 100644 index a567a2f..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State1/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "0c24e91b9c19124a5cfc920fd8f3aa38a5fab55cadfac7210dd0d5923efe7ea2" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "be77dbd12ad48502aea7d0c9bcde166a4f2930e778c87cf33492a5a54a12bb05" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State101/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State101/resource.json deleted file mode 100644 index 7d3b81a..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State101/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "c8e7b3ddf1546829f12479457bb9b35fabfbc0bd31a74f917163d47c594b4441" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "a85a89f21be543ce1c84ace6b158763dda6ef646dc0276914f2eb8be2ab73ee2" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State102/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State102/resource.json deleted file mode 100644 index e1f0c69..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State102/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "0b702011af2b8c3bde50ff5680e4af97e580c9943b30e7c41ffe711da270a9b4" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "8c03348118547621269b642817a09086963994b93f069c3dd3df9083589df93d" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State103/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State103/resource.json deleted file mode 100644 index a347dc6..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State103/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "0e93124e4bc9a8c179e6677935c6074b41a5638573165031158fecea2fe0f52b" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "435e7079f91cc27bb11bc90e7bc32e25d74ca2068989d9792fa26004bda21114" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State104/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State104/resource.json deleted file mode 100644 index deaf376..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State104/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "06e09d72aef95a2da1aca7ea3c7e829145d5bef9c1382ee3cdfd657231519420" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b925e55e4675dfab4ce92e1c55e267e530c594b67b13b8c8611429afc25b2a1d" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State105/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State105/resource.json deleted file mode 100644 index 0b623d9..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State105/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "40888f07e4df5a19de80712e0079dbdccd3cf030c86a9e72d3689a32450a839a" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "bd84bda9ebe23b6b1ee7f4c99807509758528c04e1fbb09738f978fdeefc62ca" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State106/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State106/resource.json deleted file mode 100644 index 5ceaeb8..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State106/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "af6d7728d9008b7214fa618d684dcc94e167fd49097cf2d2ef9c2d92f9cdd6b2" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "db531ee82e8af5dc73c6f02ef8cc8651dcd3ae499bc954991ee120e3c6f2612f" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State2/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State2/resource.json deleted file mode 100644 index 06e653f..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State2/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "2fc5001ba6d89e1d43a00d4f43d896996227007e606570958452e724491a7e69" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b4d86ec059286aa013918364e5dcfb0260b1f80d2c0919a6ab4e3ab3910c6146" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State201/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State201/resource.json deleted file mode 100644 index 36913bc..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State201/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "3d689f828084180ef11f29a4cab7575c39b2b7437fa3e3f631b0f32caf85b636" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "f627b38753c2c6d76827fdf42f9b781fa67a0638d81a8762997db22ac04e52a4" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State202/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State202/resource.json deleted file mode 100644 index b628814..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State202/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "36c8e02c71c4eab30e308035e07eae026067b8bc89b393f7f397950aecb51691" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "446f4bbd562da2d75dae562aaa4349aa0e5c38b3a94a43f4e0980a7f4ae72a46" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State203/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State203/resource.json deleted file mode 100644 index d5d954a..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State203/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "274b80babe73e14b28f11aa179c9570b0212eb92d4dbabbe6d28e154408862a1" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "41abd66837c6e7c6adce3f2f7380fc4168276edcc242b0757361b8eed8a97b9c" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State204/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State204/resource.json deleted file mode 100644 index d9313b8..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State204/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "36fb308ad6f1ef9bcb52ec724787246961013baf2a35697f76fc5d282079ebc7" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "79204d68965cd8409228765cfc1880e2406c1cba92cc81b8ba6355cbb71dd71b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State205/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State205/resource.json deleted file mode 100644 index 0253369..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State205/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "98859f55bb8eaa7307b85c46acef2df857560f17fbe08249be099eb79857eef1" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b97ff294068bc45aab1033cccb8171846f97af345e02e3d56e465849aa8f0227" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State3/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State3/resource.json deleted file mode 100644 index 86d3c03..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State3/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "0463b1bcdce114b56049f4d5d66e6fa76c02274cb3776c74e2986b87c2054a5e" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "edaa00be7378bdb5b1f6618e83bc4d90318ef230b87e85bb526c0c596946a537" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State4/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State4/resource.json deleted file mode 100644 index dfef3bd..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State4/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "178a19d346e196bf1e88fecc07c7ef27f9caf2b02cb0fe484d5e3481371dd625" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "e79def0feb375bc1747d7d2576996689d981397afcfa070fa58fae159b1ab1e2" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State5/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State5/resource.json deleted file mode 100644 index 3338ee5..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State5/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "028f1208a43ee271eae773ba7507e4681e9279067b45abab6be326a12a47c9d6" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "4068bfe871ee5a186590a886a0db7c21c410e1d71e1b50d0b529e26dd07bbba3" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State6/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State6/resource.json deleted file mode 100644 index 342e408..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/State-Styles/State6/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "11b50f78347d716f6fdb3166f37f6f1cbca34a8106b2968890045721f0fd7d05" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "e3cb8c318461656ca163230099d81808fbe80f80e45625a0c90a11cbc6b72bde" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text-Styles/Ariel-Bold-12pt/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text-Styles/Ariel-Bold-12pt/resource.json deleted file mode 100644 index f7e0179..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text-Styles/Ariel-Bold-12pt/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "5eff232d4a236add4243b9a567fd49854832c646b77d70b3a2bc5fc753d84936" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "3777f5f030c7d2c662afcf799dac0224c4e6f76abf44ed12e04c9ef509391c73" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text-Styles/Ariel-Bold-White-12pt/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text-Styles/Ariel-Bold-White-12pt/resource.json deleted file mode 100644 index 7842bc9..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text-Styles/Ariel-Bold-White-12pt/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "54d093ae73d6bfdec965fa0c6759311847187667d569c7e0f7625b1af9b3a61a" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "e68095578fc5b1cd5b6da361e1fbb636e8619ec382cbb783b58a8c49cb91640a" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text-Styles/Controller/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text-Styles/Controller/resource.json deleted file mode 100644 index e9ae318..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text-Styles/Controller/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "83748afa0b7c72eb6d6832e2e0f2def5da336d508a3c05e5a9eff561e82c0a25" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "7472c4201b4f9a4f8c2c9a6feb94d26db985e751e75dc351f958051331181fbf" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text-Styles/Docked-Buttons/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text-Styles/Docked-Buttons/resource.json deleted file mode 100644 index b4805d5..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text-Styles/Docked-Buttons/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "9a87e137129fb7ed6d6b8cadd482d5161a5669c71a55f8a49894459ca4c7cf1c" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "24e03971998659df7419da7e4458edca1bc2da4c2b06fc37d16b8798c92e9e3e" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/CenterAlign_with_Padding/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/CenterAlign_with_Padding/resource.json deleted file mode 100644 index 0a65a0d..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/CenterAlign_with_Padding/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "d130642f0042bf24b9ecf86acf2b95a5540d5f919d5154a575fcc997c63f0313" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "54fa37ace63e9f6a89e3121b950f40617f2a38c25faadfa8ecbaa216c59b13a2" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/InfoText/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/InfoText/resource.json deleted file mode 100644 index 0469038..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/InfoText/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "d9ec0ab273d65f093a8d1b20f9174d015bed3eb9c7896e2c9987379c208a2228" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "65aaf505764ebe541cadad601b8a2efad4625515c6bbc124859349e7e9c04b35" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/Label/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/Label/resource.json deleted file mode 100644 index ade05dc..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/Label/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "2415c6ef07fcff83403a114ed9127a2efeff86ac4ee34f85fb7fc59d29f5d5b9" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "de7172bc2c9952343fbdaf933be54f09115d6322a2abefb48388aa2ceed4a144" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/LeftAlign_with_Padding/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/LeftAlign_with_Padding/resource.json deleted file mode 100644 index bbb1930..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/LeftAlign_with_Padding/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "a0ddb3eb84d4ece9da48694777a068078c45d758e882934f3774551c316b83d1" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "11bdbc042f41523d08c262cdb89aee5c1b6559fb0b39a94373def5891904b076" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/RightAlign_with_Padding/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/RightAlign_with_Padding/resource.json deleted file mode 100644 index c25a212..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/RightAlign_with_Padding/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "788964453a5a12c53e6c6c8eb810d16a65d09034f9252b6cd3c3d6bd43ea5736" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "7c4ec037bcff49eff959414810a4c3263c1079f17344edcceef198fa0d134755" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/TitleText/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/TitleText/resource.json deleted file mode 100644 index da64fbb..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/TitleText/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "305a568e7dd1b06a773b8b0ae233e06663f1af9ac99b95a71c78d3fc849aaed3" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "41a92e5a2538077c4497b246161d67d0e11b7f59a73cc159d36480792db2da17" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/labelText/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/labelText/resource.json deleted file mode 100644 index af6d720..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Text/labelText/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "43ee2beb389393eaac849a8dcd40975a3634990f49af78ed9005194d53e38812" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "1a05be7577ea4e991515fcb3a4be177a53b76153978bf096b8ea2b9d84fd303b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/stylesheet/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/stylesheet/resource.json deleted file mode 100644 index 6663e90..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/stylesheet/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "stylesheet.css" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "3fb5b1ede87950212f37698b38436948fbfeaf22eb5c8e066b8752618fed5c10" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b1b535ab44aa4876778fb635126182187258a85b9ee0f81b0756577081d99a21" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Additional-Home-View/MAP-Home/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Additional-Home-View/MAP-Home/resource.json deleted file mode 100644 index 82b1806..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Additional-Home-View/MAP-Home/resource.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { -<<<<<<< HEAD - "actor": "external", - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "79aaadd64a52806e23b216af45bcfcf5a36b1e55165c128c778c49a182f6b452" -======= - "actor": "admin", - "timestamp": "2025-04-08T09:28:17Z" - }, - "lastModificationSignature": "602a12575373d8a0e0936969feef5ff4636b31650e0bcb5adf44cda2dbff3564" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Custom-Views/Area_Nav_Button/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Custom-Views/Area_Nav_Button/resource.json deleted file mode 100644 index 12e8236..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Custom-Views/Area_Nav_Button/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "398d8767e9492b20faafd289581aa2ba2abed7bf247a8357ac08d997af4b688f" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "d3b6122f7f2c1673b8a052ba4ea86c26a488ee6a79de1d9d9bc84f0f0dd5fb0b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Custom-Views/Nav_Button/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Custom-Views/Nav_Button/resource.json deleted file mode 100644 index 091c02a..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Custom-Views/Nav_Button/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "ecf1355ede8f6b09a65d8f742da146dbfb191053424a39f96d92eeaa41457b6b" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "8168044b9b580986d04d7381636ab57aadffec3d3240709009495c7c14dd8e31" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/Entry Point/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/Entry Point/resource.json deleted file mode 100644 index 772c547..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/Entry Point/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "e5162bb6c0b6c6d51a44215ed4d55c48b4154145db6c3d0ed67a923fec2f3498" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "536199704b8514a5b1f29cd3a6e8a76f38629b364d194b8e0717670a8aff6a51" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/Good Pull Chord/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/Good Pull Chord/resource.json deleted file mode 100644 index 96c3c55..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/Good Pull Chord/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "e6d2e1a23f2a16a4e577f0b4c6c2973f94392374fc8d254edeb15a48e7f63014" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "e7ee9911f39d62a0d1b004c071d50d5a6b87512dacf2a6d8990f6b906450618f" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM Button/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM Button/resource.json deleted file mode 100644 index 4b59a72..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM Button/resource.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { -<<<<<<< HEAD - "actor": "external", - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "097262fd90dd805b1fe7e34a474dd1461fcf3a272812e30a0bdedeed86868c34" -======= - "actor": "admin", - "timestamp": "2025-04-08T09:30:51Z" - }, - "lastModificationSignature": "1ab7d929c3b4e0a18eb53247051653ffdef711629e236bb833d955523b1690be" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM Button/thumbnail.png b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM Button/thumbnail.png index 97f79005faebeb46678cd5956224febfa9794902..06b34e33df14eb399c663443c67acbee451b5bc3 100644 GIT binary patch literal 775 zcmV+i1Ni)jP)wq;SS!MQMW1D0vF z<-D*g6S{sr&tMt`Ow)jR0q1HvbFQb2ND|T52`XjgN#mT*S=7zAPNpSUMZO?)HJ1}5 zC`w~sFIauCq@Ylg`8b_Co11Ab%6B!+0tQ7<$*hSjGQLa3P1Ay`=upVKOfYDrlgAX(G@OeP3858y(9eiz6VszHtngYqM|BT3Pe#+WV+WpT7_$WM&gLa4oTaZ zSBNFk;7FvAJj!5U^8nK^35#M40nx!)!NDqFU8-U3(7^b&EH>m*%2he%@?qk~HZqt$ zv3Ts|SpEB51+O9^zAE)LZK&uVC|2=2oJKHTp?j~k%C)bf1-y&Nq;1XHG`^k4Aa!tp zi7gppIpFiYhzD=haA#r}_a*}vI=c?PT;cH$%XvXL#<{hf-2JKUT6bKoojk7{o?790 zueP~W*q#Qx7Qa|WAd$zTr*Cm%22fer>8Hsiu*(3{W$x<_&=Onw|OT?EeHSr002ovPDHLk FV1n^rcPRh> literal 733 zcmV<30wVp1P)dFb8!{KabUL&DJ=w|hoH=K!Se6aKG%bAZy7*kGNysLj7bk4nf!pa^ z@(n{VM_e=N52AG(2j8?7wh{$tkH-D9#8t=j(|Wl|We-t2sB*4+wA08{N5quT8;&bf z+qTg*ESU(hM{hs`Q*0MH; zHj>wd3$>1FrHV+giN`0vn@ST4tGl@OY#aAib}+Yc@%i9IT-tNeH-xxuUc}~~U)Y!9 ztYvL5?O^Gr-T`8ojcTI8MUg&y@(OpC)-b!Yjv0@|b=+Qj{pb5A6dM<3Eo;Zc|3N$0 zOi|-XJt-~s3#)0|5k-1yc?+|THZj96*No!)J_ev&7B#Tc8_;r3l`M;Nd4plD9Yv)h zf{{X{oG3VnXvH-!a}kk1LajO P00000NkvXXu0mjfmSA8+ diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM Button/view.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM Button/view.json index 4058e44..5618a93 100644 --- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM Button/view.json +++ b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM Button/view.json @@ -12,7 +12,7 @@ "props": { "defaultSize": { "height": 50, - "width": 360 + "width": 113 } }, "root": { diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Fluid Inbound Merges 1-4/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Fluid Inbound Merges 1-4/resource.json deleted file mode 100644 index 3d77c01..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Fluid Inbound Merges 1-4/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "9db9134722e70c638dee38a5bcdd24aa2822adffaf29c7ed5a4875b48e66f9d7" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b0dfeabc6d5e63ec66cf17574b727a15de72cc2a775bcfbe30d0315360d69787" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Merges 5-7/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Merges 5-7/resource.json deleted file mode 100644 index 84073d4..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Merges 5-7/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "c4bdeb77977a62f18e46af97fe624ce54d628e7f3d2d6ed8b5253603a49ca2bf" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "8a7958763b0a7c0c2a094d26d8885e9fba1f5f5d5a7fccd158db7a96715d5077" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM03 Non Con/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM03 Non Con/resource.json deleted file mode 100644 index c044164..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM03 Non Con/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "4106323e4f566ea633585c969e2c7d1b037bf14e6e258fef311180cf89b3099a" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "626d84035e32dbe40aef0687771532d3db0444467768986c57e7bb4846ff2de3" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM03 Non Con/thumbnail.png b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM03 Non Con/thumbnail.png index 9b2abb46283b75e7a73bfda7f1e25c5e1e4250e6..a2432e4aee12bec9ba4f646e5e951d6ab65269ab 100644 GIT binary patch literal 65575 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 literal 63549 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%0A1?`DrgCe>7a6w4*lzM&Fu0ym;Fxt+X&DJR8;*D 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 diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM04_Chutes/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM04_Chutes/resource.json deleted file mode 100644 index 36f8936..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM04_Chutes/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "6c1c7c106afc8199e353ffc1339e1532c08f09e2ef0dbec4ff85b0e5883d1c1b" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "464ca37a6c02d163ebda9a8707174d527bf8ac73b1d688c4cad4828bed4eb1a2" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM04_South_Bulk_Inbound, Fluid Outbound and Problem Solve/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM04_South_Bulk_Inbound, Fluid Outbound and Problem Solve/resource.json deleted file mode 100644 index 72b2818..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM04_South_Bulk_Inbound, Fluid Outbound and Problem Solve/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "52146939864979f2747963c5920a4574ec92321ce203d11a84746e90fa4abee1" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "6cea978ae262f5114ffcc967d8fa27ce61eab4ffaef3743cbbfed123faf0861f" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05 North Bulk Inbound, Fluid Outbound and Problem Solve/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05 North Bulk Inbound, Fluid Outbound and Problem Solve/resource.json deleted file mode 100644 index 10e986a..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05 North Bulk Inbound, Fluid Outbound and Problem Solve/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "6c6da14df246af256db7a8cb80d21d97970e9be688ba71f8bb14bfcb0856d4b0" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "4fa2e924ae7b7840d16cd1e7981321f8becfc816e9fd96a318815f0eb5794c48" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05_Chutes/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05_Chutes/resource.json deleted file mode 100644 index 5c7366f..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05_Chutes/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "6b899c77b7ad334a18b0a7080a344145f60c2b2f050c7b520121eaf07706a7f1" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "0bd94e35c60de91f720b4f8981330e3f8caecf1f966053461a289f05b9382e0c" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM06 Non Con/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM06 Non Con/resource.json deleted file mode 100644 index a7f9e91..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM06 Non Con/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "ebf9fe82268db2b7b9b645be1fec8d3b8defb04437244c90bcd3d27067614d13" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "9ff922b2664be2dd538f4874e569e006dee646ae7b755fa460cca0055daf0d49" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM07 Bypass/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM07 Bypass/resource.json deleted file mode 100644 index d046802..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM07 Bypass/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "3beb131db2e7c9cd78fa2aef4068c4d9c54704da3580d918822642081fefae0b" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "f80954304fcaa507d1f8790b14ebc31635410a686b609b14789ca99b7e210619" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MTN6/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MTN6/resource.json deleted file mode 100644 index 3880ae2..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MTN6/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "332ca5617a8b921fe3006fc2755af85f4abc37ec01a6dea4041856d83141abac" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "06e4af688acff5e9edbd2898de2fe5d9a34bea89315df6fdb2faa4709575f4eb" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Selected-Symbol-Description/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Selected-Symbol-Description/resource.json deleted file mode 100644 index 699bf64..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Selected-Symbol-Description/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "1c09aa0cdc00bbc76de64f354d2021a21e28600f19bad38c7329fcc226f98191" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "fefdaf198da68d9f617ba36ac38ac87ca60de7918d582dca9b941ffe5f9ef0e1" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Symbol-Filter-View/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Symbol-Filter-View/resource.json deleted file mode 100644 index fa21012..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Symbol-Filter-View/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "e25dbf6b83c168d2f6452e08179aa1c5174742b35e057916c8ac241f940c905c" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "eafab02ce8e9ddda2248c044b61168504ab7a3a210aabf3bb910513a846624b1" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Symbol-Icons-View/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Symbol-Icons-View/resource.json deleted file mode 100644 index ed5bcbe..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Symbol-Icons-View/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "1cc314151d96d8412dca7766066280d49d29a437d67c7852c2d1c36dcd317f61" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "1bf0b577a006b573e896d75221e94c1026049d3e29338595d524f0d0a1490bd9" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/SymbolLibraryMain/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/SymbolLibraryMain/resource.json deleted file mode 100644 index 55d6213..0000000 --- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/SymbolLibraryMain/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "c557de6d80a901073bbb350f0342707564a0f3539e228700a5b5fe6a7fc565df" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "75b77c9971e76782f58cde134d8a6d4b155b112f498374b04d1618df53fecfb7" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/ignition/event-scripts/resource.json b/MTN6_SCADA/ignition/event-scripts/resource.json deleted file mode 100644 index 1cf128a..0000000 --- a/MTN6_SCADA/ignition/event-scripts/resource.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "data.bin" - ], - "attributes": { - "lastModification": { - "actor": "admin", - "timestamp": "2025-04-08T09:18:06Z" - }, - "lastModificationSignature": "069c57f6c8205f0698524f9dc02d27699d785453c2bb77139120fc21ce8708f8" - } -} \ No newline at end of file diff --git a/MTN6_SCADA/ignition/global-props/resource.json b/MTN6_SCADA/ignition/global-props/resource.json deleted file mode 100644 index 0bb880e..0000000 --- a/MTN6_SCADA/ignition/global-props/resource.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "data.bin" - ], - "attributes": { - "lastModification": { - "actor": "admin", - "timestamp": "2025-02-27T10:24:21Z" - }, - "lastModificationSignature": "6e175753bc8bc77b624e21e389814c862acdb50c7241d932b12fd9a3b08bdb2e" - } -} \ No newline at end of file diff --git a/MTN6_SCADA/ignition/script-python/my_fucns/resource.json b/MTN6_SCADA/ignition/script-python/my_fucns/resource.json deleted file mode 100644 index e5cd5a5..0000000 --- a/MTN6_SCADA/ignition/script-python/my_fucns/resource.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "hintScope": 2, - "lastModificationSignature": "4123caa0856b110b0585c4d1d6e1e69af63565b4b9537d213644fda985534337" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "hintScope": 2, - "lastModificationSignature": "110ebdc1f0b6f501926a62e6b3b711f343a3ed1254b39c58c6b8e414f670f3fe" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/MTN6_SCADA/ignition/script-python/tags/tag_utilities/resource.json b/MTN6_SCADA/ignition/script-python/tags/tag_utilities/resource.json deleted file mode 100644 index 32de4a8..0000000 --- a/MTN6_SCADA/ignition/script-python/tags/tag_utilities/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "2f5dcbcf41ae07cebd91578b3391e21a79fa08bc9c1a5c0e4e50153066ee7b3c", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "febbf169853558dda3c5d22bf5ddadd177e7b0d6fde86a377bdf2c1779a57d59", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/AMZL_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/build_url/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/AMZL_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/build_url/resource.json deleted file mode 100644 index 0c85635..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/AMZL_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/build_url/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "f947a9ded3a8c3f547bcb5c9cd96c8894ca75c39c62447acf36e3f71f10822ec" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "852ad58d9980d76cd5a23297030ed74e6d02868fc81f4a95726be26a988ce3a0" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/AMZL_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/credentials/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/AMZL_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/credentials/resource.json deleted file mode 100644 index b043bff..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/AMZL_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/credentials/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "720612467eaa2512dfecb6cb67f70cb53280a45a042e725c1a8dd50ab2425460" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "bf0a2b8d4ed52b865d211faf59778703bfbbe8ae22e48de1ea9a9b501bf19311" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/AMZL_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/wbsckt_abort/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/AMZL_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/wbsckt_abort/resource.json deleted file mode 100644 index 9f4991a..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/AMZL_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/wbsckt_abort/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "cfc7bebd705856fc7f7adaa79863823e8da8b73cfc15c2f38786390c5bb7b411" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "dfe6b92955838658aa2893d8eb7a455312f13fdc1550f80914e79ead49392177" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/AMZL_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/web_socket/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/AMZL_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/web_socket/resource.json deleted file mode 100644 index 9ca8f0f..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/AMZL_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/web_socket/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "3f2a9b0cd1773998b0dad1baa83e71a37442bf277ebf99e8c2fd1ac461cd5ecc" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "2f1d4b2f4bb236b9cdaecaeff66f7d6f6c9867351fb4319210fa5f57b526d0ee" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/AMZL_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/web_socket_send/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/AMZL_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/web_socket_send/resource.json deleted file mode 100644 index d40fc9a..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/AMZL_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/web_socket_send/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "fb6cc479e4dbad320ee020191aa380fa73a6d1790b91e396d1890fd266d8755a" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "8288b30358d563dbcffc68639718c4d69c4a04296427419bad71201dc1430f48" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/page-config/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/page-config/resource.json deleted file mode 100644 index 7780c42..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/page-config/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "config.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "0b5a612c4d864f31e28456b842067dc365beb29f2e997b9e4b9a67028d76b418" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "d111ed4aae06b606bf8e60bb2cd41c71b6a09a05949e5f7635da94e2c4afb814" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/session-permissions/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/session-permissions/resource.json deleted file mode 100644 index 591de9a..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/session-permissions/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "data.bin" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "4cff1265b7a277ee5ea185b0b88b93c976e84c983988bd67f52f964c275d4777" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "6a0b94fd96dc2b6922bd18f70f13c7c93d467bc84813203e6ebfef3e053f0080" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/session-props/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/session-props/resource.json deleted file mode 100644 index 109021e..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/session-props/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "props.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "53f4bec97f1cbe0d79fa4d1f0c55619c774d9cc36a1f2fe3117584c0803fb92e" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "10564629d4c4e4b19b7052e86e32227c3f52b9e3ceaf4c368387f024d3973232" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/session-scripts/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/session-scripts/resource.json deleted file mode 100644 index e9dd780..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/session-scripts/resource.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "data.bin" - ], - "attributes": { - "lastModification": { - "actor": "pllincol", - "timestamp": "2023-06-19T08:26:13Z" - }, - "lastModificationSignature": "1cd2c178f5d2b73e5040401d437510e4eceb09cc96845b9a96a625c04089b832" - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Critical/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Critical/resource.json deleted file mode 100644 index 8d29fde..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Critical/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "22a2ab06bc9ee87b140100835f2170adfc0ac29b81f9922aac213f8e1e76604e" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "eab9cbe16c832dbbb54701584553038a50a435c3f2c40cd6428d9a21f78c3448" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Diagnostic/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Diagnostic/resource.json deleted file mode 100644 index 06e5074..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Diagnostic/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "042c6fa18d1f98d941645b5b92dfb82d776bc85bc13d072330abbe56cba36ba5" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "83f26c834dbe18ee5c03f3bbd7bc20ccb9c021b1f449c3dfd48c3cd9457b5ce9" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/High/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/High/resource.json deleted file mode 100644 index cd1ba27..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/High/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "82af03b6048bd87e3d7f70d4d8614a21fbaceedea51b664cc05d4c83484675cf" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "1f308e3f17e806bb9d0c18b91b29105fd86a041c1d303d964da6560d3e0926c3" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Low/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Low/resource.json deleted file mode 100644 index 38430ab..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Low/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "373addd34413262c16f6c8ff8c230d509e953f055eb48ae1133246d23a486aaa" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "aff4f9e2df4969a2bf6328959e815eef8bec24ec2208b40fd6c30c75ea88c694" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Medium/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Medium/resource.json deleted file mode 100644 index e4ce3f9..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Alt-Colours/Medium/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "27b5681c2e2cdd7f292f97531eb2f9bd04dc62f364cf8bb190fd8e6ead5d32c8" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "6719beac1e2961b52f8ee92e1707f887e6c5d88e612ea10dfbe9ef4ac7fb3668" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Critical/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Critical/resource.json deleted file mode 100644 index 8d29fde..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Critical/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "22a2ab06bc9ee87b140100835f2170adfc0ac29b81f9922aac213f8e1e76604e" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "eab9cbe16c832dbbb54701584553038a50a435c3f2c40cd6428d9a21f78c3448" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Diagnostic/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Diagnostic/resource.json deleted file mode 100644 index 0b128bb..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Diagnostic/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "14702c7725ab81275a462df4b7184131f495a487898b94a53b1fecf877b3ad36" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "086b93b137d55e4bf5562c66f42a42a355926001ca906053c41999c38f266a98" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/High/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/High/resource.json deleted file mode 100644 index cd1ba27..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/High/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "82af03b6048bd87e3d7f70d4d8614a21fbaceedea51b664cc05d4c83484675cf" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "1f308e3f17e806bb9d0c18b91b29105fd86a041c1d303d964da6560d3e0926c3" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Low/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Low/resource.json deleted file mode 100644 index 3061c43..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Low/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "afe5169e6205d134bc233ddbaefc5d67cbb5db00c568d0427def87ed64fef6df" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "953f0bf6ec39b84459904d06ce9954c8b637c7c3f7c14232f1137d8608e6a16e" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Medium/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Medium/resource.json deleted file mode 100644 index 4341c4a..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Medium/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "a95fc36e1d9b5c9e97dd813156f1d79a81fde4b5b0a4afc1e16e3758d6794a62" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "f546ae2ff07b6385055219675d5379b9a96c1cc45fc12137579dfcb0b159c54b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/NoAlarm-Black/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/NoAlarm-Black/resource.json deleted file mode 100644 index 61d1661..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/NoAlarm-Black/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "6e28b92d666d1fd1cecbe8a437106bd0bada237b9914413656accc2867587c2a" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "4dbef54ec8fc29c5025eb79114830bf23500b5ccdd0264d192edf283a996b131" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/NoAlarm/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/NoAlarm/resource.json deleted file mode 100644 index 287d063..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/NoAlarm/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "9f35a2c236ba297966088aa004b2f424db7e330d96848ed6053ea02e9208858f" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "68c9774b39182e44396cebbd943ff69614073cdc1c614192d618173479d1d3e1" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Shelved/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Shelved/resource.json deleted file mode 100644 index b7b10f7..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alarms-Styles/Shelved/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "f819a00e80330d23448fc2bcd11355a6719ab9822d5caad74df674ca466c1a81" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "597b1d7abfabae5933ee5155c11a3109bd31c583764fae05237bf397831f3389" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/alertButton/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/alertButton/resource.json deleted file mode 100644 index e576884..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/alertButton/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "714396801aa350af6a85baffebed9f534017e8f3c5060e4efcea325d52ce0c78" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b3a828f40c06ba4f3b2ea7852db6dbba98c7c63f3af6395a43ae3f7b1966d27b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/alertButtonSecondary/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/alertButtonSecondary/resource.json deleted file mode 100644 index 291ae34..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/alertButtonSecondary/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "286ca9937f1cfc9af5d951a132d9a6e588ad24cc0019dd3ac0523329ae120581" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "1742fd6626c704c8171aa2650f1449e9495f4841c05b5b237763d5236c9dac6e" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/alertClose/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/alertClose/resource.json deleted file mode 100644 index ea2765f..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/alertClose/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "a75ced58af1e3560bc9e65edafa35f41b7a87550c6001151ebf91fa8303a99f9" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "89fa94ef1bdf1f8e05e2cb494eaa6789fff639673a89e806e3a4376b2368ba6d" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/alertMessage/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/alertMessage/resource.json deleted file mode 100644 index 0b68c47..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/alertMessage/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "189724954ee07f218e09db1b57c33710f2015f9be17e61eaa84d81b979ce0811" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "48f3c9eafcdffcdab435b1b72d828f3634bcc9f5fbb95c39fce8148845ff3419" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/alertTitle/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/alertTitle/resource.json deleted file mode 100644 index 9634011..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/alertTitle/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "1ed90dfa291f1c3edb53ce0ce5eb4d7dd512e6ed2612c97d6be6ac46c5982966" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "72bffb3daae503d7558cd29f56888838347b66f08e1a289f991d26c2e539c6a7" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/error/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/error/resource.json deleted file mode 100644 index 17cf99c..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/error/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "c322e368a924a03e1db915cb12ce8b6be9746f104847db0e2e7dbf98b9750161" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "d6a6cd7b51db473de34046cd6c57189b9504919bbbc28f406dabc8f7eaae98ce" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/errorBtn1/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/errorBtn1/resource.json deleted file mode 100644 index f8e34b9..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/errorBtn1/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "75f11fe8617da898bbf772ef3be3c274268328295eee226708b432ce736befd6" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "dfeda8574e0f90ad5ae4b44c0455b4029293b14b9d84949513af9c000459b0e8" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/errorBtn2/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/errorBtn2/resource.json deleted file mode 100644 index b452244..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/errorBtn2/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "9a10d14636ee2483a07b1c7fb46997b46b2ee4fa9b006fd6150e0b118b6ce23f" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "3a433791edd2d47f0a73b4a78f627a835c93cef6933c3f8e37c525fa28640fcf" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/info/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/info/resource.json deleted file mode 100644 index 94e1320..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/info/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "d1875a639422dd1115fceea9c64d93edcd76620e91b9bd37673c94ef4a054d99" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "abc31ca6aa3179f3224fbd126e8f5c07c62b1b0a83f5f0e65301fbf507f65d23" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/infoBtn1/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/infoBtn1/resource.json deleted file mode 100644 index bd323c2..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/infoBtn1/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "bd02477220c8eebeee7de8acfbf4f05d4b746478d6c2bc5580864556964dbbd8" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b440f4e40ef48d5a77d621ce3101094c3e499bc9676c67fc4df9faf814fbae35" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/infoBtn2/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/infoBtn2/resource.json deleted file mode 100644 index 43b89cf..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/infoBtn2/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "46dce566b4bb79d642bff6844c00866d37f5d1cec8c2c76943a7a988027e4d52" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "af159327f2d3303d712fe1d9e045451acc349d0f49c53288c14aee18c098e7ab" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/success/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/success/resource.json deleted file mode 100644 index e4d5e51..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/success/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "d00cedcbc1953061c721d09c2e5bd51c342eee33bf53cea1e8cfe37715feb3bf" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "81e0a1fe1cf955f91b3c3a251e82d556391386a2cd03f12be279accaa7f1cb22" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/successBtn1/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/successBtn1/resource.json deleted file mode 100644 index b6dcf4d..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/successBtn1/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "c7332e447dee5072a38671b5ea17e3d5a23a162cd05454859f2e9123a4396b51" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "55f79eb06c970e5ccc7f683a9f0fb2b6c6a5c2855ed65977640a61e047f8bb00" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/successBtn2/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/successBtn2/resource.json deleted file mode 100644 index 008d43e..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/successBtn2/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "5f2627dc73bb26221c15cc27779d84d6a03110e801f5882c293a24f1cfd5ec9a" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "c029a3e0079c7477837f5ce8bfda148bbcf4346cbcce34d9095455de9fe2649b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/warning/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/warning/resource.json deleted file mode 100644 index 31bbdb8..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/warning/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "b9e264e622c729dc46560cdb72ad94400af7d9c19b572a31290e047c72e14b94" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "623c6e17e07439732a1d761ffa7df85a0c68bd6c72d7c7a9dd6192e119594a4d" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/warningBtn1/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/warningBtn1/resource.json deleted file mode 100644 index 4010c6d..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/warningBtn1/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "dea0ffdfc5ee361b595ade35c7dbb6bff093e7fff59966c5797e469b038a41a4" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "8e4e279dff92dff9a9da86a244ef9dd9b3185c23c3b2c0b4af0edec44d4ba4ce" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/warningBtn2/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/warningBtn2/resource.json deleted file mode 100644 index dc1fcdd..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Alerts/states/warningBtn2/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "a871d1136ba8e68f553a57f33d4415fe020d7fe45fd2915a88734159525b2efd" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "41a078694d651728b12be9cca2f5579fc7dbab04dd9ee64ebf9383bf804fb2a1" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Background-Styles/Controller/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Background-Styles/Controller/resource.json deleted file mode 100644 index 6b6896a..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Background-Styles/Controller/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "a4c088fb7bf6c0d7e3946aca001f866bf632fe819363cf10e60a181f6202abe0" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "96c44e672b2413c49e068f2fe0cdc9d8b2cd0e36c604d353adb5cb7f999d3abb" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Background-Styles/Grey-Background/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Background-Styles/Grey-Background/resource.json deleted file mode 100644 index 671fb8b..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Background-Styles/Grey-Background/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "b304b3e1f72246aa07b7ab069eab38777941f095b5f8c4d10b351203e553ac36" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "2c7a56b7ed39584481201711814a1516a7dc3f6916b2eb8dcfdae1cddfaa7c46" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Background-Styles/Main-Background/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Background-Styles/Main-Background/resource.json deleted file mode 100644 index a5b9b5e..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Background-Styles/Main-Background/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "6e14df22ac8f79c41dccafb89011e84040e13a3fc7392d3a5f05753228d6fdb5" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "6065cc67ac7b28cc4c8795723e00140c70ffe9c08e15c036f5faa7499a96bfef" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Buttons/Button-Menu/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Buttons/Button-Menu/resource.json deleted file mode 100644 index 6b6896a..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Buttons/Button-Menu/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "a4c088fb7bf6c0d7e3946aca001f866bf632fe819363cf10e60a181f6202abe0" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "96c44e672b2413c49e068f2fe0cdc9d8b2cd0e36c604d353adb5cb7f999d3abb" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Buttons/Clear-Background/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Buttons/Clear-Background/resource.json deleted file mode 100644 index d9e3844..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Buttons/Clear-Background/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "8ee7bd4b79f6e41cc81bd8eb2e819f10ec44905b89557cd6d3368545ee57ffac" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "7953772c64e0080d92342a8ca287406ddebda3253b54c17dc9b32271828f98c3" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Buttons/PB_1/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Buttons/PB_1/resource.json deleted file mode 100644 index 77706b8..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Buttons/PB_1/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "55d9d987670e3070f2408eef07db16cf52541ecfb6adecee0eadb533d1861455" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "63cdf8d36e393c6a546c0a4d81c92a8b87a9d5e66ec3f9da5b2e5878971ec1ea" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/DeviceManager/DeviceManagerRows/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/DeviceManager/DeviceManagerRows/resource.json deleted file mode 100644 index 450802c..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/DeviceManager/DeviceManagerRows/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "55539c631e7951425e7e6297091f821e29a1e39dac3dcb68c9df19dcce69e6f8" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "7d0938951c48c8268df585bafcfef1d818c1b2f3ec99e335095aba3f84788189" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Disconnects/Device-Connected/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Disconnects/Device-Connected/resource.json deleted file mode 100644 index c8e8e62..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Disconnects/Device-Connected/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "f837ac77c45cacf2ef56006f966e64ec137a06592c02745634183e800775d673" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b7d65cf3bb8d19578cd6d1174391a14001cb3f7a5dd0aa514c1014fb535c9b71" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Disconnects/Device-Disconnected/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Disconnects/Device-Disconnected/resource.json deleted file mode 100644 index 0f56f06..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Disconnects/Device-Disconnected/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "19eefcbe9720bf5f6cf656bd5f976f7493bc331d4d8e786bd355f27036fe878e" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "769324b6f4ffeef8c25e6ad657dca34853732b06d78508960af6f5c4e616ec0b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Dropdown/DropDownBox/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Dropdown/DropDownBox/resource.json deleted file mode 100644 index 6e4f5c9..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Dropdown/DropDownBox/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "e8c75f6ed79770a060f8f1ad4329f51dd1c04c2d5ba82526f13442b7613d9e39" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b533d27339b0f078dc1d87ef14d64f686c5292d904623c079528a1095f3a518d" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopActivated/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopActivated/resource.json deleted file mode 100644 index 465914d..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopActivated/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "974459e9e8d2e121448944742ab262640694a2773f58244339b0f684201716e3" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "f284831b6f985179ae6f6a45da622272315b0d4080c0e52b60342837d803bb95" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopActivated101/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopActivated101/resource.json deleted file mode 100644 index c422199..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopActivated101/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "16dac38c467156f4b45af32d1ea0ebd68f8a279e4730c60dac0b973812a1ddd5" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "68b13f897068b96cd89b1fcfcec4ff67e8e8c2d8b4c232a354054d2218aeeddd" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopDeactivated/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopDeactivated/resource.json deleted file mode 100644 index d699fa4..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopDeactivated/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "43f944783897a56c92f3040458bd56d37e6b0e9177f7ed3b8ab918d4602e7e66" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "675563744d4acd29dc810d70f1a193131e178834f815c6de3ab804446d56fd1c" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopDeactivated100/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopDeactivated100/resource.json deleted file mode 100644 index bb3397f..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/EmergencyStop-Styles/EstopDeactivated100/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "cb00f7719dae83d60057f95198e28fd01cf800509f5abeebecf477c4663e2112" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "3bbdf0340ddeca2515a694d2884c5b5ab5b808f6791337ef28a117a84f63f6b1" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Bold_Text/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Bold_Text/resource.json deleted file mode 100644 index fe41bec..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Bold_Text/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "91c56eab559428eb193b064af830125eb717db290fec32c134c1804ea3870151" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "fc53536f5db680a666b814e1b5fe24124510d555bcb8ef147c46fcd961353d3e" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Card/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Card/resource.json deleted file mode 100644 index fcd3f4d..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Card/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "1836331c3d7f2d5ba70b811f7f9b401c90a7bb21611f22ccefb3d59b8e278a5a" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "54a8840883fc968533de6c5d2aea9b67bd451f2c7a2c01154af2fdd57fca147a" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Card_transparent/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Card_transparent/resource.json deleted file mode 100644 index b7fe09a..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Card_transparent/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "040c04d5bc6d489b75d87573203efe5086780f17c58564eb52e4b22819b1c850" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "2c1558a3902e8c04cf8c4ea38c39d9b3742b3a9e6169a52d4ce8773ab79ddff5" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_error/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_error/resource.json deleted file mode 100644 index f9daa55..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_error/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "febcc73437355ffef2d1396a4a88fb037e10ce683884cf5ce55053fbd5a209d6" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "e13331c3b72d29b04fbf5ccff90f98c36af8c0d203c5cd1dc356741542833ae2" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_info/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_info/resource.json deleted file mode 100644 index ff3df4d..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_info/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "b475e8e1b8aa48bad8821dde8a8fe2584b8ed6d2205a6497e4d9f9d7ec888e97" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "8616c2922b7cbaf69b27cdc40a17c47a8ac5dae710e0c055126de3c0f78d65c8" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_off/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_off/resource.json deleted file mode 100644 index 9be9ba8..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_off/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "8af54cc404a9219334aea82b41b9cfaa0e178c93102e000d925e238e9efdcca8" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "607810e3d208ec39bfa9515d26ce4b2d238b668a3ed1a61df52f7c1cb8c1de63" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_success/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_success/resource.json deleted file mode 100644 index dc6b4e6..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_success/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "3976ef7e4df79e3f5cf65c80a05a87c1068847be4aaa5d4fc86e67c8472cb7eb" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "4b2bfacf276e7f33047cc58b94cecc338459859236fa1c70afb578a1c2f11617" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_warning/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_warning/resource.json deleted file mode 100644 index 9b904c9..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Data/value_warning/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "aeab00f511d394d3ebd34907a3a28cee590a3d60393345d4b0dccd24dc7240a2" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "2a32dea7c29e99ea89a440e87641254eba13065c50b13cc6d3da6973a401361d" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Embedded/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Embedded/resource.json deleted file mode 100644 index ade05dc..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Embedded/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "2415c6ef07fcff83403a114ed9127a2efeff86ac4ee34f85fb7fc59d29f5d5b9" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "de7172bc2c9952343fbdaf933be54f09115d6322a2abefb48388aa2ceed4a144" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Embedded_transparent/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Embedded_transparent/resource.json deleted file mode 100644 index 4b1356d..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Embedded_transparent/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "d700365a07f90c8452ffbda3c2f565737575a659c3bedf85fd694f16f110dff8" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "42d2f212c92264ab32e7c463ad53b61e5bbd595c8c32443d857d7ec539d452ba" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Item/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Item/resource.json deleted file mode 100644 index 1bc2c82..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Item/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "76734d73d0820a92af4a48baf2383779fea884daa9c9f84684d43639766b3b29" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "a12d6d781127a7498df097bdfa1afb7dda81d585a23aafb3e8146a2aebd72356" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Item_Border/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Item_Border/resource.json deleted file mode 100644 index f8505d2..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Item_Border/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "9d3cddb03d3006d0e7aa95626fd3cd9f67f5dcea4c31996aa0556e0ab05593a1" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "ceb68eb299a29dcbcd5743eedf003037247490d6a32dfad7e492515327fdae1a" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Label/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Label/resource.json deleted file mode 100644 index 0b453fa..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Label/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "4df86f33c002752f3ea2cf6dc0d5f08fc1f341cf44642f4993e0c92d00449543" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b9264694f3eac0cf63def2a8be38ed8e5fcde8b78faf941b8137154773045533" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Row/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Row/resource.json deleted file mode 100644 index c8d7b3c..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Row/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "cf70462781c5b67b1f5e41fd24c58ea868d84fd5a0a1ebd0b8823a8761f98862" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "16be2163c211658d9853c45e6c8d83834e40124f785ff0073f3a51013bc16a20" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Title/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Title/resource.json deleted file mode 100644 index a4ccd3f..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Title/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "b206ea44d0271fdce869a30c8a2e676ee8d0c4f7d441ba25e4ee1c20c59a8f97" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "e999b3390b2641f45b6c4681a1aebf932e85c346e06eb815fecbbb81bb7806da" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Title_transparent/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Title_transparent/resource.json deleted file mode 100644 index f1f0ca8..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Title_transparent/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "9a7939ceb7608e61e84ab871507f580c6cb44ae10a15d7c5da3cc293ead99c52" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "495a9df5ace18cff2b132cbd6bceb45dd14f8e7aefafe844080b05d3399ae176" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Value/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Value/resource.json deleted file mode 100644 index 37093a9..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Card/Value/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "dd8f09686f5d513a2e4590594c4c5b3c75bd25ae06116c7b7aca9e950ea122aa" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "91cb9292a4986c4c724cf3a949c651107c782c78020e47d1f1ab45a9bfa8f667" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Bold_Text/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Bold_Text/resource.json deleted file mode 100644 index ec41f3d..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Bold_Text/resource.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "data.bin" - ], - "attributes": { - "lastModification": { - "actor": "duscoope", - "timestamp": "2024-01-19T19:06:21Z" - }, - "lastModificationSignature": "724ec4a29768744e8a98b04beeaeffbe2786f9510a4c74fb1f704afedd7945f0" - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Card/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Card/resource.json deleted file mode 100644 index d5dad4e..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Card/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "4404ee2b043a5d217b9aece32c91278f4fc9cedcf4f9c0c4afec52e2b6f77c03" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "ed1c3f6b9290025ba16d620902f6641109c1b9e0ef7cfb13e4db23159bab8282" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Embedded/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Embedded/resource.json deleted file mode 100644 index ade05dc..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Embedded/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "2415c6ef07fcff83403a114ed9127a2efeff86ac4ee34f85fb7fc59d29f5d5b9" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "de7172bc2c9952343fbdaf933be54f09115d6322a2abefb48388aa2ceed4a144" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Item/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Item/resource.json deleted file mode 100644 index 2972ec1..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Item/resource.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "data.bin" - ], - "attributes": { - "lastModification": { - "actor": "duscoope", - "timestamp": "2024-01-19T19:06:22Z" - }, - "lastModificationSignature": "79005be23b3ff6489426936b79cf3f2ebab8457a1095db43007414b860a6f3fd" - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Item_Border/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Item_Border/resource.json deleted file mode 100644 index ad62454..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Item_Border/resource.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "data.bin" - ], - "attributes": { - "lastModification": { - "actor": "duscoope", - "timestamp": "2024-01-19T19:06:21Z" - }, - "lastModificationSignature": "f0ee9cc172435a4fe10515590d008d84463ab6a3dc039b86f4f469e10944b7a9" - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Label/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Label/resource.json deleted file mode 100644 index e137b69..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Label/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "4327c17f72f02b15ba7d4e397c919b2a8559b0197c88090b6aa07391152766ef" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "1042c756d2aae3bbedf278beb831ce4a6dd545608c101c7ed864ec730aae41b3" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Row/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Row/resource.json deleted file mode 100644 index c8d7b3c..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Row/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "cf70462781c5b67b1f5e41fd24c58ea868d84fd5a0a1ebd0b8823a8761f98862" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "16be2163c211658d9853c45e6c8d83834e40124f785ff0073f3a51013bc16a20" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Title/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Title/resource.json deleted file mode 100644 index 44ebc46..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Title/resource.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "data.bin" - ], - "attributes": { - "lastModification": { - "actor": "duscoope", - "timestamp": "2024-01-19T19:06:21Z" - }, - "lastModificationSignature": "7c6da0dbdc1a180ea324c7fb08f7188364ef2e586aed38dfa3b92f24cda32db7" - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Value/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Value/resource.json deleted file mode 100644 index e0b31fa..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/Cards/Value/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "6d7beda4963a3bc27e85d5f1818d7812c4cfbda507e53df164074ad2db46be8e" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "f964d10e26fb741813855883de15a2c187a5f346a02a01e679a3b5761de54003" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/ColorPicker/Container/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/ColorPicker/Container/resource.json deleted file mode 100644 index 013715a..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Framework/ColorPicker/Container/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "0c7413318d401b25db20622e217b968784ab299993d4fd7dbd06b2d975596e77" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "443c3f8a985799f9827d5f5dcf894dde72f73656bcc720a99b454194e2e33f0d" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Input/Button/Action_Button/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Input/Button/Action_Button/resource.json deleted file mode 100644 index b718868..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Input/Button/Action_Button/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "fe0b39eb46c8c0c8452c24e8bfac00d85eec54ab5c73f5bac0060ce1c634ba60" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "f7406832b95930419f80fc8bb87232ed6cfcc16ff7e2add345abc43dce680daa" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Input/Button/Action_Button_Disabled/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Input/Button/Action_Button_Disabled/resource.json deleted file mode 100644 index 0498d53..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Input/Button/Action_Button_Disabled/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "716e1d219d5bb14739872bf5872a991b095023ebbf310c62dd8a268c9e1544b8" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "ba250af82e9ff6b534d42def4416fc462e8256d1877c72525a1fd2346cdf4355" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Input/Button/Action_Button_Error/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Input/Button/Action_Button_Error/resource.json deleted file mode 100644 index 571d512..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Input/Button/Action_Button_Error/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "05a4e3bad372437b2537aa7b5e3f61c9dc85620a1c5267f3d51be67575883d6f" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "353d1f6e895a7614b12443524ee28df72bc3cf2d0faf33d5dab7bf3604400713" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Input/Button/Export_Button/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Input/Button/Export_Button/resource.json deleted file mode 100644 index 00ab713..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Input/Button/Export_Button/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "07db31e2bd3f407a5d8cd985ae0132c211b75d1d0202eb4b6e92d6e86137e6ad" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "56eefabc2c08a65f1e6a9ca639583b47f9e3ef72c8e79c4f0120d93ce3668adf" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Input/Button/General_Button/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Input/Button/General_Button/resource.json deleted file mode 100644 index 00ab713..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Input/Button/General_Button/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "07db31e2bd3f407a5d8cd985ae0132c211b75d1d0202eb4b6e92d6e86137e6ad" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "56eefabc2c08a65f1e6a9ca639583b47f9e3ef72c8e79c4f0120d93ce3668adf" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Input/Button/Secondary_minimal/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Input/Button/Secondary_minimal/resource.json deleted file mode 100644 index 9e1c102..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Input/Button/Secondary_minimal/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "33ab8342d1f6fd414a6cfba0ec7f42389b5f266e1c35e900005639b4534801b3" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "14e2664998fce713f5eb781e239bafb64e055944bf89c5c06008b52ce68ee315" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Labels/Label/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Labels/Label/resource.json deleted file mode 100644 index 6d709b4..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Labels/Label/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "eeb0f47ce0b296f4cf37d230673c7da533aa93842ba8886d58a724cf7e7e193e" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "4537a8ffb735fdfde7ca2ed392f2d8b5242f175ad0592654014a138098c1365d" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Labels/Label_1/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Labels/Label_1/resource.json deleted file mode 100644 index 1d65f10..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Labels/Label_1/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "4bf87224975b175b180cc625ebcbd287ae105f286d3982563985d35e83fd5092" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "d71c4bc53b1ad816b63dc88de7678244ff70c504c9feb1428366dd6b2fbe35e4" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/PopUp-Styles/InfoButton/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/PopUp-Styles/InfoButton/resource.json deleted file mode 100644 index 1d613ef..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/PopUp-Styles/InfoButton/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "0359baf0953f470bfe754aaa651b9d0d8eee5c171775407e5361ed6b2bf7264f" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "696a34b42a46f5c8877d88770077a0002dc40423710ef088b5dd70bd88029b67" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/PopUp-Styles/InfoLabel/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/PopUp-Styles/InfoLabel/resource.json deleted file mode 100644 index e040845..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/PopUp-Styles/InfoLabel/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "cf83ae8c01c91cc7d25377875ae8b5b6939140ea83c620348730fd3b718d56aa" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "763ca54255054b405500b5e9821fed68e7c15d6606c8e41dbaee255ae5f60ec6" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/PopUp-Styles/Information-Device/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/PopUp-Styles/Information-Device/resource.json deleted file mode 100644 index 2059519..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/PopUp-Styles/Information-Device/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "6accd9d18f40d9a1e3e73319aa8ae3d89dd5a4cc61e07d9665c903438507893f" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "c6d565f6d9d7e1486a3a23af50404ffb8f957a17cc43ef1880c4ea141a566e5a" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/AAA-Style/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/AAA-Style/resource.json deleted file mode 100644 index d785bf3..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/AAA-Style/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "19577f7ebc22743bf08b05bc14a2102c8bcc5215eb17bb20251543e7facfd1d2" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "89b67366db982d45417263469dc6ebb4754ed735d81c8b2e988bf8ae48781889" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State0/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State0/resource.json deleted file mode 100644 index f5ca3f2..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State0/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "82af8e05410881086cf4682cd97e07a80bf057f6693e28deb733e580fd7c7a1d" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "1138a2feb5d9b21d97cd71085ef2edb7d9aa9dc470f241b6c62c5a1e43ef6578" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State1/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State1/resource.json deleted file mode 100644 index 879e793..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State1/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "bea4cf807431b794039a981a4da353124ea3d8b57bb368802fc51fc7331408ea" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "97213fa1880be55f9e65379a77f9c3ade2a645216c3d6176ad0ccb484061add3" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State2/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State2/resource.json deleted file mode 100644 index f391288..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State2/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "49912130a378b6780fd21694baa30a3392bbe9d808fb68722cb50bc0bcea6204" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "c1063b49f652d9d808153be13a2fe57bbb7228901b3171dee3d6a270c2b80f2b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State3/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State3/resource.json deleted file mode 100644 index 7240030..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State3/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "e29f696b4dd9714f4799a9f6eebe918a1dbf892f6f0ee8a583a73ad51ec7e377" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "944a41a1f530c1aac938bc43b0fca6c5a8594a4cff6c077b98fde42cbf7f2f54" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State4/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State4/resource.json deleted file mode 100644 index 36853e7..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State4/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "5eb8dc7797cdad8d0075089d1cfb8c50f3affcfdd183743135b9e38f96770d53" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b3a4a6aa45796677b6dea5e14795b20451532ba247959c34a32fc0ed8394feaf" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State5/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State5/resource.json deleted file mode 100644 index cb4266f..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Alt-Background-Fill/State5/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "315acc11c701143c651ee5435b70724cd33cc672c5036739f89e9a47bfad2652" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "ca633d5a182556c28f58d6cf0a75a8d876d7ed2f4bfd5ad4fab3eb435e6ee1c0" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State0/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State0/resource.json deleted file mode 100644 index f5ca3f2..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State0/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "82af8e05410881086cf4682cd97e07a80bf057f6693e28deb733e580fd7c7a1d" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "1138a2feb5d9b21d97cd71085ef2edb7d9aa9dc470f241b6c62c5a1e43ef6578" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State1/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State1/resource.json deleted file mode 100644 index 879e793..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State1/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "bea4cf807431b794039a981a4da353124ea3d8b57bb368802fc51fc7331408ea" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "97213fa1880be55f9e65379a77f9c3ade2a645216c3d6176ad0ccb484061add3" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State1_Alt/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State1_Alt/resource.json deleted file mode 100644 index 879e793..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State1_Alt/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "bea4cf807431b794039a981a4da353124ea3d8b57bb368802fc51fc7331408ea" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "97213fa1880be55f9e65379a77f9c3ade2a645216c3d6176ad0ccb484061add3" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State2/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State2/resource.json deleted file mode 100644 index 8405988..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State2/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "a2f36f5edcce1277ff91dafe373a22b54a953c980469ce73928488437cb13e69" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "9e3d3622f6b6fe94c8673adce6e4d444cad3fa13dec3b40df0878aa05b99bca2" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State2_Alt/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State2_Alt/resource.json deleted file mode 100644 index f4e7ed8..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State2_Alt/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "fc028baef4a64a74f4a7cd4c660d14d2461a891971fb83a46d9656daaecf4e1a" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "8fca873cb4d4c3767f381d6839838c584c222d2893f96aad46a35217321396db" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State3/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State3/resource.json deleted file mode 100644 index 7da7d99..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State3/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "4c9419856c32a6a6667a954d2388b454d49218e510cb4ecd3239ca49fb1a2a69" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "69c1fde28be64b19007ecdc276586b630bf0f5498cb27bf06b78d9b21ce57192" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State3_Alt/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State3_Alt/resource.json deleted file mode 100644 index 753b0bb..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State3_Alt/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "743892b7ae5de00ce1dd53b226e272d0fe3cf2bab8772b058ba6631558b65e62" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "9e6d2f6685262b291f79fdba9fe4050fc6dd3f2a4534bc3e3d4b50a0985f83db" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State4/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State4/resource.json deleted file mode 100644 index cb4266f..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State4/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "315acc11c701143c651ee5435b70724cd33cc672c5036739f89e9a47bfad2652" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "ca633d5a182556c28f58d6cf0a75a8d876d7ed2f4bfd5ad4fab3eb435e6ee1c0" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State4_Alt/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State4_Alt/resource.json deleted file mode 100644 index d269168..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State4_Alt/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "4023554c82a104bbf91f83665d8b30a87d99b2e0766cc79db97d1ac669774aa6" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "2126e88ce57230ffd398a422a763ee37d8bc178f8d3e6218bb3d10dc1f94da5a" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State5/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State5/resource.json deleted file mode 100644 index 21a368d..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State5/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "c983955ceb615cc543e192e19cc26acfe8d881649af53e189e60c3e0d64bd184" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "55168d27b34a758e38bfe4133eaf3462ea88879866575a15ea7451ce93103905" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State5_Alt/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State5_Alt/resource.json deleted file mode 100644 index 87addcf..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State5_Alt/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "fc7eb7cfc7098d19eb7c3cea351cc311c8a3a0eb4b09e5176300969bda799b33" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "1bb886dfdc12b37ac679e6a797f4fe85d570e57fc38dff863671773e206ba4b5" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State6/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State6/resource.json deleted file mode 100644 index 79a73dc..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/Background-Fill/State6/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "8a7c54b4193d14765edf5b972e0715d42f39710b636c3e5f2dc1532596d2c233" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "7f59f3595a0b0516ebb83eb153cb669633751c7a41802af54d69d01e3a17e5e4" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State0/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State0/resource.json deleted file mode 100644 index 06e653f..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State0/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "2fc5001ba6d89e1d43a00d4f43d896996227007e606570958452e724491a7e69" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b4d86ec059286aa013918364e5dcfb0260b1f80d2c0919a6ab4e3ab3910c6146" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State1/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State1/resource.json deleted file mode 100644 index a567a2f..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State1/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "0c24e91b9c19124a5cfc920fd8f3aa38a5fab55cadfac7210dd0d5923efe7ea2" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "be77dbd12ad48502aea7d0c9bcde166a4f2930e778c87cf33492a5a54a12bb05" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State101/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State101/resource.json deleted file mode 100644 index 7d3b81a..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State101/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "c8e7b3ddf1546829f12479457bb9b35fabfbc0bd31a74f917163d47c594b4441" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "a85a89f21be543ce1c84ace6b158763dda6ef646dc0276914f2eb8be2ab73ee2" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State102/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State102/resource.json deleted file mode 100644 index e1f0c69..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State102/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "0b702011af2b8c3bde50ff5680e4af97e580c9943b30e7c41ffe711da270a9b4" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "8c03348118547621269b642817a09086963994b93f069c3dd3df9083589df93d" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State103/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State103/resource.json deleted file mode 100644 index a347dc6..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State103/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "0e93124e4bc9a8c179e6677935c6074b41a5638573165031158fecea2fe0f52b" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "435e7079f91cc27bb11bc90e7bc32e25d74ca2068989d9792fa26004bda21114" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State104/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State104/resource.json deleted file mode 100644 index deaf376..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State104/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "06e09d72aef95a2da1aca7ea3c7e829145d5bef9c1382ee3cdfd657231519420" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b925e55e4675dfab4ce92e1c55e267e530c594b67b13b8c8611429afc25b2a1d" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State105/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State105/resource.json deleted file mode 100644 index 0b623d9..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State105/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "40888f07e4df5a19de80712e0079dbdccd3cf030c86a9e72d3689a32450a839a" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "bd84bda9ebe23b6b1ee7f4c99807509758528c04e1fbb09738f978fdeefc62ca" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State106/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State106/resource.json deleted file mode 100644 index 5ceaeb8..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State106/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "af6d7728d9008b7214fa618d684dcc94e167fd49097cf2d2ef9c2d92f9cdd6b2" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "db531ee82e8af5dc73c6f02ef8cc8651dcd3ae499bc954991ee120e3c6f2612f" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State2/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State2/resource.json deleted file mode 100644 index 06e653f..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State2/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "2fc5001ba6d89e1d43a00d4f43d896996227007e606570958452e724491a7e69" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b4d86ec059286aa013918364e5dcfb0260b1f80d2c0919a6ab4e3ab3910c6146" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State201/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State201/resource.json deleted file mode 100644 index 36913bc..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State201/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "3d689f828084180ef11f29a4cab7575c39b2b7437fa3e3f631b0f32caf85b636" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "f627b38753c2c6d76827fdf42f9b781fa67a0638d81a8762997db22ac04e52a4" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State202/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State202/resource.json deleted file mode 100644 index b628814..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State202/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "36c8e02c71c4eab30e308035e07eae026067b8bc89b393f7f397950aecb51691" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "446f4bbd562da2d75dae562aaa4349aa0e5c38b3a94a43f4e0980a7f4ae72a46" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State203/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State203/resource.json deleted file mode 100644 index d5d954a..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State203/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "274b80babe73e14b28f11aa179c9570b0212eb92d4dbabbe6d28e154408862a1" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "41abd66837c6e7c6adce3f2f7380fc4168276edcc242b0757361b8eed8a97b9c" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State204/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State204/resource.json deleted file mode 100644 index d9313b8..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State204/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "36fb308ad6f1ef9bcb52ec724787246961013baf2a35697f76fc5d282079ebc7" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "79204d68965cd8409228765cfc1880e2406c1cba92cc81b8ba6355cbb71dd71b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State205/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State205/resource.json deleted file mode 100644 index 0253369..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State205/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "98859f55bb8eaa7307b85c46acef2df857560f17fbe08249be099eb79857eef1" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b97ff294068bc45aab1033cccb8171846f97af345e02e3d56e465849aa8f0227" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State3/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State3/resource.json deleted file mode 100644 index 86d3c03..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State3/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "0463b1bcdce114b56049f4d5d66e6fa76c02274cb3776c74e2986b87c2054a5e" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "edaa00be7378bdb5b1f6618e83bc4d90318ef230b87e85bb526c0c596946a537" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State4/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State4/resource.json deleted file mode 100644 index dfef3bd..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State4/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "178a19d346e196bf1e88fecc07c7ef27f9caf2b02cb0fe484d5e3481371dd625" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "e79def0feb375bc1747d7d2576996689d981397afcfa070fa58fae159b1ab1e2" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State5/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State5/resource.json deleted file mode 100644 index 3338ee5..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State5/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "028f1208a43ee271eae773ba7507e4681e9279067b45abab6be326a12a47c9d6" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "4068bfe871ee5a186590a886a0db7c21c410e1d71e1b50d0b529e26dd07bbba3" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State6/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State6/resource.json deleted file mode 100644 index 342e408..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/State-Styles/State6/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "11b50f78347d716f6fdb3166f37f6f1cbca34a8106b2968890045721f0fd7d05" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "e3cb8c318461656ca163230099d81808fbe80f80e45625a0c90a11cbc6b72bde" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text-Styles/Ariel-Bold-12pt/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text-Styles/Ariel-Bold-12pt/resource.json deleted file mode 100644 index f7e0179..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text-Styles/Ariel-Bold-12pt/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "5eff232d4a236add4243b9a567fd49854832c646b77d70b3a2bc5fc753d84936" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "3777f5f030c7d2c662afcf799dac0224c4e6f76abf44ed12e04c9ef509391c73" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text-Styles/Ariel-Bold-White-12pt/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text-Styles/Ariel-Bold-White-12pt/resource.json deleted file mode 100644 index 7842bc9..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text-Styles/Ariel-Bold-White-12pt/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "54d093ae73d6bfdec965fa0c6759311847187667d569c7e0f7625b1af9b3a61a" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "e68095578fc5b1cd5b6da361e1fbb636e8619ec382cbb783b58a8c49cb91640a" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text-Styles/Controller/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text-Styles/Controller/resource.json deleted file mode 100644 index e9ae318..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text-Styles/Controller/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "83748afa0b7c72eb6d6832e2e0f2def5da336d508a3c05e5a9eff561e82c0a25" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "7472c4201b4f9a4f8c2c9a6feb94d26db985e751e75dc351f958051331181fbf" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text-Styles/Docked-Buttons/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text-Styles/Docked-Buttons/resource.json deleted file mode 100644 index b4805d5..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text-Styles/Docked-Buttons/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "9a87e137129fb7ed6d6b8cadd482d5161a5669c71a55f8a49894459ca4c7cf1c" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "24e03971998659df7419da7e4458edca1bc2da4c2b06fc37d16b8798c92e9e3e" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/CenterAlign_with_Padding/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/CenterAlign_with_Padding/resource.json deleted file mode 100644 index 0a65a0d..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/CenterAlign_with_Padding/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "d130642f0042bf24b9ecf86acf2b95a5540d5f919d5154a575fcc997c63f0313" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "54fa37ace63e9f6a89e3121b950f40617f2a38c25faadfa8ecbaa216c59b13a2" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/InfoText/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/InfoText/resource.json deleted file mode 100644 index 0469038..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/InfoText/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "d9ec0ab273d65f093a8d1b20f9174d015bed3eb9c7896e2c9987379c208a2228" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "65aaf505764ebe541cadad601b8a2efad4625515c6bbc124859349e7e9c04b35" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/Label/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/Label/resource.json deleted file mode 100644 index ade05dc..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/Label/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "2415c6ef07fcff83403a114ed9127a2efeff86ac4ee34f85fb7fc59d29f5d5b9" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "de7172bc2c9952343fbdaf933be54f09115d6322a2abefb48388aa2ceed4a144" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/LeftAlign_with_Padding/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/LeftAlign_with_Padding/resource.json deleted file mode 100644 index bbb1930..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/LeftAlign_with_Padding/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "a0ddb3eb84d4ece9da48694777a068078c45d758e882934f3774551c316b83d1" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "11bdbc042f41523d08c262cdb89aee5c1b6559fb0b39a94373def5891904b076" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/RightAlign_with_Padding/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/RightAlign_with_Padding/resource.json deleted file mode 100644 index c25a212..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/RightAlign_with_Padding/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "788964453a5a12c53e6c6c8eb810d16a65d09034f9252b6cd3c3d6bd43ea5736" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "7c4ec037bcff49eff959414810a4c3263c1079f17344edcceef198fa0d134755" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/TitleText/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/TitleText/resource.json deleted file mode 100644 index da64fbb..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/TitleText/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "305a568e7dd1b06a773b8b0ae233e06663f1af9ac99b95a71c78d3fc849aaed3" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "41a92e5a2538077c4497b246161d67d0e11b7f59a73cc159d36480792db2da17" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/labelText/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/labelText/resource.json deleted file mode 100644 index af6d720..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/style-classes/Text/labelText/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "style.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "43ee2beb389393eaac849a8dcd40975a3634990f49af78ed9005194d53e38812" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "1a05be7577ea4e991515fcb3a4be177a53b76153978bf096b8ea2b9d84fd303b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/stylesheet/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/stylesheet/resource.json deleted file mode 100644 index 912116d..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/stylesheet/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "stylesheet.css" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "67d9d1e2990d6ad2e9dc913d5871fd839d4d7c34094b9c1c165e0dd9d472a591" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "01819e04564578bcd6afa2dfdf7409c546d8a3baae86e79f4e4fb60a4f13569e" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Additional-Home-View/MAP-Home/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Additional-Home-View/MAP-Home/resource.json deleted file mode 100644 index f003005..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Additional-Home-View/MAP-Home/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "e6ad0aa05498455c286b790c447abf3986a6196c4dac888c344c8e8d914139a3" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "4613db240cd58f4ff3abf0f4be66564ecca7ffb9e28e38d5b777041202d564f1" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alarm-Views/AlarmTable/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alarm-Views/AlarmTable/resource.json deleted file mode 100644 index f51f3c1..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alarm-Views/AlarmTable/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "9336edbb8c144ac140dd426b284692da7c0fab1d51951718ebb611fd7c42ec15" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "df4834d3e317c262571be29365f740d2f5d00126365c371d46418b3ddcdd8381" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alarm-Views/Docked-Alarm/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alarm-Views/Docked-Alarm/resource.json deleted file mode 100644 index 29e88d1..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alarm-Views/Docked-Alarm/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "93d1693e912b8c1db3770b97515f95a669a27eae420991f53638f0632c2915e0" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "dd4b0f887ec3213936fcaa0ae25e861eafd7f375bd884a85394852ce615cc1fc" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alarm-Views/HistoricalAlarms/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alarm-Views/HistoricalAlarms/resource.json deleted file mode 100644 index 9f6ba17..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alarm-Views/HistoricalAlarms/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "9ca28235ab6716e174ac301012c633657ad7eae7e634d7cf6224b6bed9273e22" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "520ca9154983ebd5e278483cb1f1ad256993cf1f3e781a27554bff0679845a8c" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alarm-Views/RealTime/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alarm-Views/RealTime/resource.json deleted file mode 100644 index 73e4de9..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alarm-Views/RealTime/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "056cd7e85176b3890e13ac12c111415ac04b4b26ebbd8d824eeb81e1c72cb60e" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "cb80873a0ef1d66b711edd8e270520c95a308b61d5c3ca678cc23dcd6cb1933b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alerts/alert/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alerts/alert/resource.json deleted file mode 100644 index 9905475..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alerts/alert/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "2ab021372adb47f5daac09c6bc42289d2fdb2b5fdbda6a84b7b8850318933017" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "eec93c36f0b932178983c2c65b7c8a191a9bdab5ec256052a819c07ee9f3a370" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alerts/info-examples/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alerts/info-examples/resource.json deleted file mode 100644 index 818dda5..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alerts/info-examples/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "c742f4b8b0308155176673ef47dcefb5d8f85841dbcfb3d08ecb0538029a0109" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "5c99f52206d24bf9c953abea1507affead8c7b07f9c564b2c99adf9a6ebdb66f" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Custom-Views/Detail/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Custom-Views/Detail/resource.json deleted file mode 100644 index 6658b12..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Custom-Views/Detail/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "9ae9ae9546463f665e010d17943efd3c3135e24212280331d67ce370f0f5fada" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "316b20bf08061a619bcb66762cf8f140ab51fb29d964f2047473fd435c737c20" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Detailed-Views/Detail/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Detailed-Views/Detail/resource.json deleted file mode 100644 index 804d583..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Detailed-Views/Detail/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "e565643891bb7278ad4f4b3337f36943bd932005e95aaae58bc4b30950a1ee0f" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "c0337b0c48fb20d075184e05209bcab5aaaec17a9c0e13b1aa472412e3ebade3" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Detailed-Views/Template/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Detailed-Views/Template/resource.json deleted file mode 100644 index 88ff333..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Detailed-Views/Template/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "d63cb9711c9e9417c50a5f64220ec7d3b7ea92fafccd5f754588b666c12b016e" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "03764a6a622bb36c9c637ac70d721389ce8d90ea42b60b06645a3c7cde89ab0b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Detailed-Views/Test/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Detailed-Views/Test/resource.json deleted file mode 100644 index 976c0ce..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Detailed-Views/Test/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "b928805f2b1773a6d2615c78031217809939702428169b8b6902b4e4464bad0c" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "43a8db761f730e74784565018171c502b2978d65bb59aa48d786927f769e7a85" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Breakpoint Embedded/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Breakpoint Embedded/resource.json deleted file mode 100644 index acec6ea..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Breakpoint Embedded/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "3eb2a36839db787d7a4159e77fe9dfb6e782d7e6e67c9b504961c05abedb5b04" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "e75ce372e7f387ba717bedeca382e1283799976111ddb5e1497be2652ed06aa7" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Breakpoint/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Breakpoint/resource.json deleted file mode 100644 index 9fa3db0..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Breakpoint/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "5b112e6badeb0677e7b61f57328e6d3ae5f1165e252cf60f69a4f5a90d8e3763" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "3c2bc9cb4f1ffea9010ed391fec0a4fc64be785643412d922498048a25c3e24b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Card (1)/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Card (1)/resource.json deleted file mode 100644 index 4244796..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Card (1)/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "fcc93d3e735a45d4e3c5e58d7f4ff3d1519bd3c4c64098c8defdfc6269aeaf45" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "c2cfb4cc9631383c08824a5b04035d2be4b726b282d7637a3c72c695ef76eb4d" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Card/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Card/resource.json deleted file mode 100644 index 390105a..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Card/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "1e098d504afad944fffef5b90eed83a4f6e9fdf8387f3b5991ea1c0a01cef90f" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "06c23e01ec290f6ca13eeef551662e73462fde0213329dffc4bd8fb2905b9fd1" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Card_Collapsible/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Card_Collapsible/resource.json deleted file mode 100644 index f933cd7..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Card_Collapsible/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "97eb807359c4e884dc63bc9781c28c69c134a2b33ee03ba637f45a876398f7dc" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "db86885342f7d66f668c795dcef365b245903e2866dd2bb7c0b65eab3ae9bd84" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Card_Collapsible_Transparent/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Card_Collapsible_Transparent/resource.json deleted file mode 100644 index 0adafee..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Card_Collapsible_Transparent/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "e7a27451202ef1176bb47e7801e5512f88c2846c829cc2f696b94f7ddf1b4ac2" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b3b901d566bb11ba621e0d10ea0319a82c4c91c0b63bd4762c352a32cc2d23f9" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Card_Collapsible_Transparent_with_Anchor/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Card_Collapsible_Transparent_with_Anchor/resource.json deleted file mode 100644 index 635d71a..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Card_Collapsible_Transparent_with_Anchor/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "da711099114d8fb2b5aed77470d918adb58f335248b0e47e12254355793900ce" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "01a60868ab804c7749f2122d2f2aad8446d4d6733b32ea2e911e0f2b92c74bf1" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Nested/Card_Collapsible/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Nested/Card_Collapsible/resource.json deleted file mode 100644 index 85cec73..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Nested/Card_Collapsible/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "294becfef012346fb46e9f428a870158635380f35aa52eb4f6478fe3542068c7" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "86179f813b805558be87e83fc056ab19c1376faa6c9e3f6e43d295b92eb38414" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Nested/Card_Collapsible_Transparent/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Nested/Card_Collapsible_Transparent/resource.json deleted file mode 100644 index ca4290f..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Card/Nested/Card_Collapsible_Transparent/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "e4fe3fbfddba01878e9b0cb9c9a94306534c28c3aa15f973d4f0e457f286903c" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "ca725b6832353b0593d29ff2fdcbc56bdd2bb91713e9fa7fc8f0cb89df182e4a" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Color Picker/Color Picker/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Color Picker/Color Picker/resource.json deleted file mode 100644 index 6326502..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Color Picker/Color Picker/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "1e6541a8f05bafba48361d6429f4f9fdf39ea27c179d9641f994bc8df29941e7" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "e7e63150cd795f1cd8c52796da1fff1dc9a0c1dc9350f6f112015f2aa9d1176c" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Color Picker/Color/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Color Picker/Color/resource.json deleted file mode 100644 index edba799..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Framework/Color Picker/Color/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "3307b7546d788e496323cd09b58dc139fd5079e650a328070b973c5bccf3ba1f" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "1336c010d1ed3ecb3b153589fd49b384580c9d23ab8fd69e4e1a5aed09ac7f7e" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Header/Header/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Header/Header/resource.json deleted file mode 100644 index 469d9af..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Header/Header/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "b4b27d91d807beeac5167adaa28c5a58d23a08f9b25a3fe6c72d3ca2cb1b5ca8" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "06ddb0449b703928a3e4774c5b0a07898223175e43d6e75b65816e252328ef09" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/ATLAS/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/ATLAS/resource.json deleted file mode 100644 index 7e0fa6d..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/ATLAS/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "0da63c71d0a1f6aef703df9cb966bc61c81e669e35d0194c5a15e11550fbb4d6" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "c7c504e9665bcb66e566db4583e1c139f26835a42b3a0c7730e2063c18a4e5e7" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/CommandControl (OLD)/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/CommandControl (OLD)/resource.json deleted file mode 100644 index 40fce68..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/CommandControl (OLD)/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "d3c26fa20062596f2ac5ad203636728f4bba54f81e24ca0cbc3cdf0b473f5250" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "feac38165b34fd5e39adc2e1564ad85100faf24f5b2d964e3e9006f08febb7bb" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/CommandControl/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/CommandControl/resource.json deleted file mode 100644 index f5545b0..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/CommandControl/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "d20b5dbaf99448bd81c0562e1be262771e056e46144e620cfb94cabfd28aa006" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "a87d4c3aa617cddf1e567e1a391ef8bc7f81a8d9903e8ce204fb78cf501ff7c8" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/CT_Main/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/CT_Main/resource.json deleted file mode 100644 index a491839..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/CT_Main/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "85cb5942562a353382d06e8d00e84866bfc296cd7b24b1a779b30c89be03476b" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "713a9ec5a3f159e0258b6044ee4075a35dd478324b80ea3a39d66ec96e90c267" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/Column/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/Column/resource.json deleted file mode 100644 index 49e727e..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/Column/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "d16fbd722b73ff5b4771477b0454f8c2d20d02284ec5506cef1235d871445dc4" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "6034a7817ddb7a48866c4de18590a5cb79154942328ce74aeae2d381823fcd04" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/Message/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/Message/resource.json deleted file mode 100644 index 9341285..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/Message/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "35487a1c3466ba8b74f54ffc333b165514218639305544766dc09f55c11b7240" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "f1a055cb360c4c0890dd82da99df265a63b54b5c8138bcf823306666bf43df21" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/Row/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/Row/resource.json deleted file mode 100644 index 023385e..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/Row/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "3485fc2fa3f3f8af5244441d491ddb91259c5ef601eefd3a6bd89779421efc67" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "20c6fb177bea412308ccefef761d00f14a21e4158e622665889890d76398261d" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/SequenceTester/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/SequenceTester/resource.json deleted file mode 100644 index fb72b2d..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/SequenceTester/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "8ccb3e6818284492f03699d6cc58d46583297f6b1a0fd65aaa45b2afa4f91b2d" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "841a078edff0ff93e8f1e4e35110c5a1ad93689eb80048766be8cdec5304bc65" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/Upload_files/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/Upload_files/resource.json deleted file mode 100644 index cb8f430..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/Upload_files/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "dc5b69c57b22bf75757a8d77646e3a80c61e56c795f754f42432a53f9d079b43" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "54ebbae3b268c42e1b6200e1128a11bfc677dfcb0d5f82a8803489d354a85aff" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/UserFeedBack/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/UserFeedBack/resource.json deleted file mode 100644 index 503428f..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Commissioning Tool/UserFeedBack/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "738a54f348668eccd8528d7ff9dd644f77afd375c2e3b027cd090639dc4f0d53" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b7dfda241687801792f734523b88fc6890e6990126f2fe116982f00de21b982c" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Config-Tool/AddDetailedViewMapping/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Config-Tool/AddDetailedViewMapping/resource.json deleted file mode 100644 index 109a601..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Config-Tool/AddDetailedViewMapping/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "9bd94148b4ba6c2f9e95a4c0947937a60c5b8f40e542d45e5fd5bf21d0cfee40" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "32b82ca7b252b327df407ecfd98c0e7ec7b5af5101b1615c9dc626fa38768da1" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Config-Tool/AddDevice/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Config-Tool/AddDevice/resource.json deleted file mode 100644 index 7de1bb8..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Config-Tool/AddDevice/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "a25dd1db2e387dc85e8142d5611a67b3871aaa41bd1762ecd377c47132275ad0" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "3dcab5296f96e3c3206a1b8c3a8fa3c399921994f1d19d880258ffa9f2a88b53" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Config-Tool/MainView/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Config-Tool/MainView/resource.json deleted file mode 100644 index 5d600a1..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Config-Tool/MainView/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "1aa611def9058fa30f18abf7efa6a6eea0986e905271f2a12f3a1b38bc1d0aa2" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "798ec4d6a3af6cc38484e1731369d853a8cdf312ff14e6af87589360f23d2041" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Config-Tool/SideMenu/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Config-Tool/SideMenu/resource.json deleted file mode 100644 index a35b82b..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Config-Tool/SideMenu/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "181d2368f7eb52eafc3f7e112b6d708bdf1642e65c2700741d070e568ca96fd3" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "a41682e488e91b7244b105d4eb82716aa5776345af220823e0d371e42f7869d0" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Config-Tool/TagViewer/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Config-Tool/TagViewer/resource.json deleted file mode 100644 index 57b7f95..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Config-Tool/TagViewer/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "e032cb5d62d7bad67f50a428581969b49be78dc171ea8879d3a9549d3473f663" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "abb0368b8e639de366e48da8e2ee0448faf7781617191fa43ca6757e9b38d5fd" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Device-Manager/Device/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Device-Manager/Device/resource.json deleted file mode 100644 index 698caa5..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Device-Manager/Device/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "5565cb1945c50f8ca8c21414b2d6ae1df088ccac99286165cede5468b4f4cd75" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "7eec97369adc9e2f85b63ba32dc96fcb18e2a5a7918c1a9f9fea9a96b6144c4a" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Device-Manager/DeviceManager/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Device-Manager/DeviceManager/resource.json deleted file mode 100644 index 2f7c343..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Device-Manager/DeviceManager/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "f78ea0769da37adfc53ee6b989f31f41a90bc3b6d9ecf245fdf249bf4206b84b" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "95da99ac02b946d60785078ff1f6f4ad0287786912c93f309c019cdb7446d6a3" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Device-Manager/DriverDropDown/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Device-Manager/DriverDropDown/resource.json deleted file mode 100644 index 3713db6..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Device-Manager/DriverDropDown/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "5006dab1eac9ac4629cb27465005f194acbd537fd4118c79d9a969dfb778a98a" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "9e74e9b48d11b4e329eca67d073b828422c60c39ac0793052a27e1038757e414" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Help/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Help/resource.json deleted file mode 100644 index b448897..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Help/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "6a7aa1a3b26b7c20e147a641e025b5c60d06689590c579558346551fa586fac5" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "683a44a7f375338c96150b6460c036ca385af28f58b296e217be6a5d4bbd6de3" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Home/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Home/resource.json deleted file mode 100644 index 2aad178..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Home/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "d6daa35243f949d3bead4eda1ae398f29f454a7dc543a1433dd383f2093a81ab" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "d61157abc3685484c8da6874702e16d59a9a4e175cec90ef0cbab1e3619f7c6c" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Monitron/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Monitron/resource.json deleted file mode 100644 index 633610c..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Monitron/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "121c8a61404874a284a37e8ebd44456027d077cdb5241b49aba8f35adda8a841" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "1275caebf510817f2ffed8e8acfbfc85ed512fd6c0c6777f7e95be3f56ffdcd5" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Notify-Tool/Notify-Main/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Notify-Tool/Notify-Main/resource.json deleted file mode 100644 index 537f699..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/Notify-Tool/Notify-Main/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "507c71326e0b8bcb9e3bcaebb5da2d31b7afc3bf490edd901b9eef04e28d390c" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "cdc246200ba1360e6c61fd94bc2239629fdf2d3c15cf07f9b8794127e3251dc0" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/OilMonitoring/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/OilMonitoring/resource.json deleted file mode 100644 index b6ac43d..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/OilMonitoring/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "c509a01607bf8d3ad7459b52eb59560b7b574ffadce160961aac3102338e3478" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "463cef980c8f9382ddd5f79dccf59875a7c7783c65cb4a790a55487f67240a8e" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/S3/manage/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/S3/manage/resource.json deleted file mode 100644 index 1c7c7d7..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/S3/manage/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "472f57625f309a6193ed852563f6e045c29c97d56f255c7908c34e5bd3fdc477" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "38a39929a61fe13d7907a036c71360717c8f1fb4e50a1147b8f7358bc2df413a" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/TempMonitoring/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/TempMonitoring/resource.json deleted file mode 100644 index 1ad6538..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/TempMonitoring/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "0dc77b059263cfa8eef70c7bba0ae6bbffc660d1e84417dd1d7d6aae665aecac" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "85b7d1a5176c5cebb31fcb9cc9bc525a6e57fd93988220e34b316de50a13e60b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/ToolBox/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/ToolBox/resource.json deleted file mode 100644 index 999e8a7..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Main-Views/ToolBox/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "a2dc2d3a0a433210e7ddc81667bfe031965ad1c5b5408e4c97dab45a1ddcbf64" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "5849ec085e885ea4fafc6e3ced0ab4a50a87e27273b8e4b04c68d28e3ff46227" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Docked-South/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Docked-South/resource.json deleted file mode 100644 index 50f6b52..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Docked-South/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "bb374450af3d01a7bcb19be80038ffd0127219551f97a867e06c37dab73f1ceb" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "0753505bbbcbe55f7d6c9e9ff6dabcb10bdc695e81557f4564a490908a68a3bf" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Docked-West/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Docked-West/resource.json deleted file mode 100644 index 949bc3b..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Docked-West/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "1d01914c451634c51be5d1f1c09287677653c4baf7feb78d8a831c2097b59203" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "71dd458df15514c9f077cbc4ab84c1f584b60df90856cc4d46af22190483f0a9" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Key/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Key/resource.json deleted file mode 100644 index 8809adf..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Key/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "bf0ee447ed1ba8d184b44907e9d6ae9bfa9d3bc45517a71b97e6284ae733498f" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "102cd1373506ea31aebe2b2aafb3cf559e4d4d776cabb2f00249e3a955542e9d" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/NavLabel/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/NavLabel/resource.json deleted file mode 100644 index 720b65f..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/NavLabel/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "3df1340560ad09f318ed8881d114158443cbb097ed15cb016ba73fcd2a5da6aa" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "e9da2bc54000c475e1805caac805581e1a20e93b64614f54b9813bffc12533f2" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Nav_Button/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Nav_Button/resource.json deleted file mode 100644 index 577f00c..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Nav_Button/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "9d89e68dfbb18e5f44be08268918b4f2744b2148f019c6d42c62f93fdbcca937" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "e1ea5806c1290ef063dea9f5bbd35074894757b97ff2f123544380a376fe3761" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/NavigationButton/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/NavigationButton/resource.json deleted file mode 100644 index fb38f19..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/NavigationButton/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "2de03c0c4212cc18cfc241aa558c4d08131e64e5633229c9ab150abaf848645a" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "183e450d6c85ad48a755fa6b79f91cc1dedf46321bd85bc58156a0c7df9b84b8" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/PowerTable/ColumnSelection/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/PowerTable/ColumnSelection/resource.json deleted file mode 100644 index 3284225..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/PowerTable/ColumnSelection/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "273dbc0e72bc8a409548bb641f3fd52944d4a04a2335dabee4e1b776b2b3192f" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "ee4740024a3fc744f84fdcf039da6c77b5fccc0335aa5a40f1443e2e9a9e2319" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/PowerTable/ColumnSelectionTile/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/PowerTable/ColumnSelectionTile/resource.json deleted file mode 100644 index 6aa1ab3..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/PowerTable/ColumnSelectionTile/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "eab54369f634ce2f5ebefdb075a892506bbdb78af71a602644c81fd12d8d95eb" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "f777a4786c798b1b590d7d04e02c1a946e3c06e1f307c9c8927c051438329dbc" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/PowerTable/FilterMenuGroup/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/PowerTable/FilterMenuGroup/resource.json deleted file mode 100644 index c301d5d..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/PowerTable/FilterMenuGroup/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "de5ee8c68506a44992e55385e5980566f7b1f4b71e05b209cd254b57aca25c6f" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "52bc523d95b930ac3a8b719f0c8757000d968be9cc4206130309f286cced620a" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/PowerTable/FilterMenuItem/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/PowerTable/FilterMenuItem/resource.json deleted file mode 100644 index 1607e6c..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/PowerTable/FilterMenuItem/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "3625fb1c1dbf7309e91dd89b092a92d5ee3948d14ccdd8ce675865f69847c165" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "74c7787189f17185e6ecba5eab0109ee1c7b40b10f630a0a701aecfa786bea7f" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/PowerTable/FilterTile/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/PowerTable/FilterTile/resource.json deleted file mode 100644 index 1efbcc5..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/PowerTable/FilterTile/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "cac81709f092c41242121c11f392e03929e5922b792a403e52fc0a128d5bf733" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "00e2f6207d42162b573db53631db40a23330720beb58f14306966d442a4c5eef" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Input/Generic Numeric Input/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Input/Generic Numeric Input/resource.json deleted file mode 100644 index 400bd14..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Input/Generic Numeric Input/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "a008320af73a8ab2b58c16e3aaf1bfdd8f36d8a61c82384fa49a49f3a37b91bb" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "7fff06b65755d19ac9ac8b3dfb8a82c8d6d8c3e2e7f3a27a7f3621a29a618165" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Input/Generic Text Field Input/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Input/Generic Text Field Input/resource.json deleted file mode 100644 index 9ab4bd5..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Input/Generic Text Field Input/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "49e95a57baffa70668cffda775563322335994bd0de8c0804de0c3d7b90adda4" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "33f250a9ad1261af9f4d6ff80fd3c549d71bebbb81802064e3bb809c558f5818" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Input/password_field/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Input/password_field/resource.json deleted file mode 100644 index 97603bd..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Input/password_field/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "d99d73c5ca52dc572cf15727e8105e182ba75f06f47eed04f8e352abea056b44" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "2207193e3418036cd98b34975c5cb962be97644a1ade9f3db592019e28c0c9d0" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Input/text_field/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Input/text_field/resource.json deleted file mode 100644 index 7abd7dc..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Input/text_field/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "898b9435d420be0c1cf7726e7097267fd3297de8fb15b872249c9148bda09855" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "705be9ef0ae4fca119eb48910c365558d88bea5eeca8088c5f9e4ceaab375891" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Labels/TextInput_centerAlign/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Labels/TextInput_centerAlign/resource.json deleted file mode 100644 index 5298ff4..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Labels/TextInput_centerAlign/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "746b7fa9f397e475e2666278e9cdf4437b2439960a8c64f13d7396c345f89e63" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "4ccadb0934ef29044930e8c3c710bac2ac44d96383ef7a00d96c72d03be79741" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Labels/label/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Labels/label/resource.json deleted file mode 100644 index a8ae98d..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Labels/label/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "15b85ad2bbcee751bf88181ad2b7a0946deb81331d98fb05f8891b12f9e53d6c" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "eab2f546ef5c90d6d50f141b385af04ff994cef9380f871580bb3757e7132f57" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Labels/label_CenterAlign/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Labels/label_CenterAlign/resource.json deleted file mode 100644 index 4a743b8..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Labels/label_CenterAlign/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "7218819122879579e620168ea24aa45f3d1d44e677fb8000aa92ff20996ffdd8" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "3b992f938a08b3dcbc522dbdac64278b06dcf947902c96e98a3c96941a9040c9" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Labels/label_LeftAlign/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Labels/label_LeftAlign/resource.json deleted file mode 100644 index 2f435e1..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Labels/label_LeftAlign/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "36631b3062a4131d32883531ebf6ffdf5e4cfc8290cf94caf702743296da4017" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "bf056233800706256cfc477abc52c8e07a30b749e799d7d76e74566afa4a572d" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Labels/label_RightAlign/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Labels/label_RightAlign/resource.json deleted file mode 100644 index ea7fe78..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Labels/label_RightAlign/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "aa3b9d5ca309ee6584d74142e5647466ee6aaa11c1b16ea40b18b737edd89140" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "a29c8d9d176d1c57be6c457adcb6240e5d3bbb11729232dda2778f118a6f3f41" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Labels/label_legend/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Labels/label_legend/resource.json deleted file mode 100644 index 37e3355..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/Labels/label_legend/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "98d1ef36d76c2a10f1a3cb22daed0152079d1856e06869f15d4a6566ab2fabd7" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "eda0c1b5f0ed87dd44cb4d0f13e41e304b9b31abef16584ecef921e36681dd4b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Audit/Log_Table/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Audit/Log_Table/resource.json deleted file mode 100644 index 4745a67..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Audit/Log_Table/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "1552752a47673b32efbf8d9d1953a1a8beb25ba1d8d0b2430a43a6fc5aed6d31" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "85515dc9a6a3ce4f9a62bba1b72c321662338e47b2d0070ea44d0ab12deed5f0" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Audit/Query_Options/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Audit/Query_Options/resource.json deleted file mode 100644 index 270495c..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Audit/Query_Options/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "fa78c45fc8d0a9c5e260e783760122b0f9a9b5756eb55cf68c74300057f1de92" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "44eaaacf8410491fc4e1e9328520f83b7fc7686348505194e99eeb929b338ede" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Management/copy/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Management/copy/resource.json deleted file mode 100644 index cb231e6..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Management/copy/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "b20a5e9a80322f197389bf089752d4da116c163fc0977ce709aae9c4b3ddbdd4" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "921a90ca6604af476c585a5c3ec958bc746a3126e3735cc40e0ff4a42d43ef54" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Management/file/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Management/file/resource.json deleted file mode 100644 index d2c14d0..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Management/file/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "f3caaf151729067b3b51100cc2aec96cc117022d4a2f2d310d0904694481318e" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "3e95df20419fe4876a0ced41bb0cb9b0d788276a64db68157b40e41a550217f6" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Management/manage/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Management/manage/resource.json deleted file mode 100644 index 559078c..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Management/manage/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "c1adf279acd087f1d689484b19e6ab52ed38ad28fa22a3615cca4433c132ba95" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "95751d660943e4d22dd6cef12c4c77beba11dfb57864bac1f63a04f63f2ecc7a" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Management/site/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Management/site/resource.json deleted file mode 100644 index e808554..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Management/site/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "07f36306d7a60ff7d8bc211186df67af633e9e96e5564a0ca37853e61dc08957" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "a1ac9dfa5b9a8b9d8e6d597eb65ee006cc9b590805338640da04497c1a82385b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Versions/Log_Table/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Versions/Log_Table/resource.json deleted file mode 100644 index 91cfe13..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Versions/Log_Table/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "ae863fe8dcd875646d1695fca3363eddc0e8455fdb00fe948675ad37f0a6a88f" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "c02d0f305eea0fc01a2891ddc1eab27e8cde51b69348ffd5e28c5c782c08b5a2" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Versions/Query_Options/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Versions/Query_Options/resource.json deleted file mode 100644 index b25868e..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Objects/Templates/S3/Versions/Query_Options/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "c7432536a14d32d5f7e0df0c61fd6e2850baac3e4055e08bacddf1b6bdd25cf1" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "da3aa0f0ebe2e00012c2f42cf8f99c6cb0fbf0c3bea7a41e06294715e73c0f1a" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Command-Authenticate/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Command-Authenticate/resource.json deleted file mode 100644 index fea278b..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Command-Authenticate/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "ffb7c993e33020cd7730c5af961a65b5bc1375f5412b9d6dace6868a5e5d9d5f" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "d8c9346f8d800d4578ccb4ed33c763a8281ff2489928539e2f998a3f34e99b54" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East/resource.json deleted file mode 100644 index 2719353..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "e6854b6b56d4cfcff63781733109769599275037d3af8b025c60bccd1752cff9" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "6963938ff8667b89d810e7806ddd02d8f14309896fe9a95a018da2ee80b2b35b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information/resource.json deleted file mode 100644 index 83bdaf5..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "797483973a43e78c22dd3eacd176567422c3bf8ccc75be90ce2a94d937c0cd50" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "957cb0f7ac2ca2733d0906ea6eaa1ceb9d56b0cb76aead048d5154e4894962e6" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/resource.json deleted file mode 100644 index 02f54d1..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "2f4147e3e2257fcb8fdecd9428b52acd0e256595178550c70e50dd74bc34a210" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "afdbc6c55f3c1b63596518adb828168116854c5e2058dd2726594ba76c7575d7" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Device/Information-Device/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Device/Information-Device/resource.json deleted file mode 100644 index 22aba49..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Device/Information-Device/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "4addc6bf4c56431dccd1243e2fe9153288a6d51bc72395154a31ab78297971b6" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "be6333cced98fa701c03e7fa4ad47295994be743f5265dd96a37963fd42865e0" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/EditItem/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/EditItem/resource.json deleted file mode 100644 index 72548bf..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/EditItem/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "724e55825c53cc3a63546201eac894b253e36c4a97b5d708cc8012cf55459d84" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "f88017e536c6dbb649689c07e9f8f98af2f3840d59b40fe1ef7bc717b3e0e1c4" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Error/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Error/resource.json deleted file mode 100644 index 909db82..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Error/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "42b7ccffd136bed16de3fbb17a9e11f1fbdf5f4b97f94beeed673b1c7a1b9802" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "33e52f74be3b833b0bc9028ba2ec6951ea22eb3136c3af055dbdb2fdb2774330" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Legend_Popup/Legend-popup-view/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Legend_Popup/Legend-popup-view/resource.json deleted file mode 100644 index da39cfc..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Legend_Popup/Legend-popup-view/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "e1371fae489e3a2755a26429ccdbab88a9ce0c51b5d6d003b9bb0ce738e4a2ce" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "6891d76a2e0c8e8c0eb7bad260371eed21de057a30403a22e505d16847dbcab8" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Legend_Popup/Legend-row/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Legend_Popup/Legend-row/resource.json deleted file mode 100644 index b170524..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Legend_Popup/Legend-row/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "f68411275896ea26b476d5ac9a94fe0e4bd49d6acd9a488de26142ef1c6324cf" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "8896826c95bfa71318241f2757363c48803a05da32a0c1b088a5e3e67f2a29eb" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Legend_Popup/Legend-table/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Legend_Popup/Legend-table/resource.json deleted file mode 100644 index 7b00e68..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Legend_Popup/Legend-table/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "78e0beec62da54f4b560a1c5f201973c57556b5398e75bf1d6e355ad15860e40" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "ed60c239259fcd195015c4a566bcf9e6edb9a1df54595a9f199390174e134ffc" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Notify-Tool/Notify-Popup-Entry/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Notify-Tool/Notify-Popup-Entry/resource.json deleted file mode 100644 index 6215ce2..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Notify-Tool/Notify-Popup-Entry/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "8f3f561055827638790c1dfc4e13413a828642e073db83dcc2ef0200dfe47544" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "33f8005bf3b432c192bb83ddebcf3e6d3ed3d9848a91dd6ee53ef26925091721" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Notify-Tool/Notify-Popup/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Notify-Tool/Notify-Popup/resource.json deleted file mode 100644 index e70903e..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Notify-Tool/Notify-Popup/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "49ba77da3024be3a70ef5d8cbac83aab3501f937a301af6d35e225826a4922d3" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "a2f3e62ab39058a29d7d2de84be2fd07265c9f85eac7b87bc1bb0c25c7d750d5" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Notify-Tool/Notify-Submit-Popup/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Notify-Tool/Notify-Submit-Popup/resource.json deleted file mode 100644 index 770385b..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Notify-Tool/Notify-Submit-Popup/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "0192222d8c4c3314518e1449e5bbeddcfcd064e451552eaa0997024b88b93b78" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "0018379ac7e8e25d3cacfe1b2f80854c97366dc1c5f683a6c52455863eda37ef" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Permissions Error/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Permissions Error/resource.json deleted file mode 100644 index bcbc0f1..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Permissions Error/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "9867b0c6192715dc28d38d666ee50406d8d839403bb378665c430b57ddbe1cd8" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "e5f0789907338702f278d80d1ac2471477f1a3ca0fdc55d62864b3f4d61bb483" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/S3/Audit/Log_Viewer/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/S3/Audit/Log_Viewer/resource.json deleted file mode 100644 index 0a62bd4..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/S3/Audit/Log_Viewer/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "ab0cd54f9837f4f38fd4c8be655d01a7d1ede6ead73b178866965ef14b8c1a6e" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "31b9e505ecbe8466f0a1670635def06ebadd1fa60a8c89b8dcdeeda317b00f88" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/S3/Versions/Log_Viewer/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/S3/Versions/Log_Viewer/resource.json deleted file mode 100644 index ceb70e7..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/S3/Versions/Log_Viewer/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "fbc464fceb387478c287e1a58793942f1d5cce8c90979e0fa67b22127f87fe04" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "83ed87cca109bc17bb2b7477e1be180010471de5b78320e2c2f3726f12a7eb47" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Search/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Search/resource.json deleted file mode 100644 index 9a87b33..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Search/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "9fdaac0db81010ad73d911b5b1bd2d6a94b0a2eaedc824bc93db11ecc6dafab9" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "e5c48822a8d149b2203ea1b4a87e891df84c03ef719bcb4e9329730c38bfa16d" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/UserInfo/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/UserInfo/resource.json deleted file mode 100644 index c20c758..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/UserInfo/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "0af13cf16639dd74a31159df77c2c58d38b207c282ab5deac45f119a32149c38" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "425e76234e56dcdaa7c0865e77ab9301662a5ab84b17a7ced97fc5b0b71a6e5d" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/State-Views/State-Table/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/State-Views/State-Table/resource.json deleted file mode 100644 index 1097189..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/State-Views/State-Table/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "7d61cdee2ef951a4849b942f6cc5a831a751d363b712d495b640cef34ff2a7e9" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "e4c76e33fd7b97b54863ba55fe0f6c492c964b0d543033ce9c12f870d6f6a79b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Controller-Views/CommandControl/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Controller-Views/CommandControl/resource.json deleted file mode 100644 index 1b0cce8..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Controller-Views/CommandControl/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "1bbabd7a97a7961c00943b396d5da1dc5c2914ff02e1c216cee39bd83ed57521" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "a1770ccc873f6bbdc4c11e4654fdfd398e653678deddf6ff2c6d5854df9a029c" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Controller-Views/CommandControlActions/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Controller-Views/CommandControlActions/resource.json deleted file mode 100644 index 5a88d06..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Controller-Views/CommandControlActions/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "fcf2b76dfba7cca58587e4cf12625a5d1866fa48a704f3490fa1e0fa96f42430" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "121073c8460483f17b0e16f8d8d46c0321da2bca8a5082e68ba07925f327f964" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Controller-Views/CommandControlAlarms/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Controller-Views/CommandControlAlarms/resource.json deleted file mode 100644 index 06440c0..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Controller-Views/CommandControlAlarms/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "79bdce93de766c378475b37379767d5a52d8c0f8be4c10b8a9934ffd74f963d2" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "6aa4c334c1142088084ad75487239d0125461b9984c1c86246bc831af71baffc" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Controller-Views/CommandControlStatus/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Controller-Views/CommandControlStatus/resource.json deleted file mode 100644 index 6be12bd..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Controller-Views/CommandControlStatus/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "ef97421eb478acd502a72f025633fe14f18f5b1071bdb094370f8c508e37857c" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "2f7b5ac49f1abd7b2e31e11c45e656e85067312ae100a3f23d68e0848491bca7" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Controller-Views/ControlCabinet/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Controller-Views/ControlCabinet/resource.json deleted file mode 100644 index a6847cf..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Controller-Views/ControlCabinet/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "c63b15afa0d7de5fd2df347b675355d0f81314ede1cf888578573756a5592253" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "d90dbf6cb5d0499e46e851a7ea48c59e7bdce6b618ad32ac621233154538fc42" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Controller-Views/ControllerStatus/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Controller-Views/ControllerStatus/resource.json deleted file mode 100644 index 2da34dd..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Controller-Views/ControllerStatus/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "4ac85f8c58ce99edc6be78c69fbe76d7996c8dfdbd960a66f3a200f281e774cb" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "bfb929300f16a3f87f43c9662fa966cd5db95f961b305f414623b8eb1df44baf" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Device-Views/DeviceStatus/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Device-Views/DeviceStatus/resource.json deleted file mode 100644 index 2a17609..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Device-Views/DeviceStatus/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "ac83322682663a7c40bfc8e4e139714f38a20d020e9cdb0f2299202db574e252" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b970c7e443cf45a6e6471f2f60fb4981a3e56b53a433a445667724e9912c31ad" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Device-Views/DeviceStatus_old/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Device-Views/DeviceStatus_old/resource.json deleted file mode 100644 index ab71fa2..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Device-Views/DeviceStatus_old/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "86096eb603759e004bba0eb85c0c046ad6a66c31bfa2e3b599fbe8fd0337912f" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "10c2ad31af2fb5d71e176dfa2932019b6ced58bdfc0da5c1c29ae06f34d3e48b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Device-Views/Estop/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Device-Views/Estop/resource.json deleted file mode 100644 index ddd0349..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Device-Views/Estop/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "8a2edec075ac92e3c1e4e200a58fa6e539ed061afe8143da0945391135d27802" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "41218afac1d984a45f52e197099d1b347d9d0ce816c67c53c8caaa2d846f8159" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/ARSAW/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/ARSAW/resource.json deleted file mode 100644 index a921a22..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/ARSAW/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "ab5d3e0c219ca35abec7edad4f98fbaeb215dd56a590787fd89aa4f139b6db00" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "5580fb029cd09acf27e5a8d9790d32e3ad6e2c707c05c46d503c73d1de69628d" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/AUS/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/AUS/resource.json deleted file mode 100644 index 493f37f..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/AUS/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "5b40734c5e060eebc3989ad54e6d9d5f3ffbc5a65dd0498d44a050ffa57bfcc2" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "caf3c1d519272f728548e4b44b723dcdfef915ad88d17649f443da1234c02f7b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Camera/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Camera/resource.json deleted file mode 100644 index b5b8ab2..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Camera/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "8bafdc6b6c8cc9d9cb9326cad761d16e73daa5b32a2ac8c0a95c7267eec7f0fd" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "758fea8e744e72078054c54e3450d69a39418f37517c3ea13762bcdd978a9193" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/CognexCamera/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/CognexCamera/resource.json deleted file mode 100644 index b5b8ab2..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/CognexCamera/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "8bafdc6b6c8cc9d9cb9326cad761d16e73daa5b32a2ac8c0a95c7267eec7f0fd" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "758fea8e744e72078054c54e3450d69a39418f37517c3ea13762bcdd978a9193" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/ControlCabinet/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/ControlCabinet/resource.json deleted file mode 100644 index 860fb0f..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/ControlCabinet/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "a6e6f6457f9d55a7094d9ba38b7a68af9cb386ae281c5e8495d8dcc1a9ae8a97" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "7ddb6c98540f684aa0407174528d656d694e4f35dc4d0041f0bf549d90eaff73" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Estop/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Estop/resource.json deleted file mode 100644 index 32140ab..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Estop/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "26565dc73d8381740cfd067ad919d1a917c45ade78c1220a4360964ccfe0fa7f" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "8ae30f340ab63800cbc56fe22b52dad1d35c40f57c6ce811c8020184a5ac8b57" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/GoodsLift/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/GoodsLift/resource.json deleted file mode 100644 index 96612a5..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/GoodsLift/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "fc291d066e96685573c3c8a71649173056ae927c795e2947f53d2d637eb8b805" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "abf8dceb7ed1ae2d4a95b968639abaed3901302b9e2fd4cd5f7a529db6bb4728" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/JAM/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/JAM/resource.json deleted file mode 100644 index adea7af..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/JAM/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "42722790dcd0e8483fc18448ff36d7e11b537dd15e0038ff0fdbd9b669a0469e" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "e6f6d9211643bf19f40f62daee69ff0a54b8bcf1c88956d18f5cc56a06508652" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Kobukuro/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Kobukuro/resource.json deleted file mode 100644 index 0bdb1b5..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Kobukuro/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "2796ce5c4b910e29722c12da0645b3b2a0ed39f9b853845046bf08f26a3b5990" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "d505c96fb3cbde02e616fd2de8fac3f93c0c0a3100098e93b160473dcbab34e3" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Lift/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Lift/resource.json deleted file mode 100644 index f37d4e3..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Lift/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "5cc500fcf81be70bd834bf377084fa1ff019b13d3e609a7f079c5b99b9daf9fb" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b6f5dc73b260cc8306ec1bc12b0001233a29b6eecc1d28e8975e8d7f626fc6a9" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Light_Curtain/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Light_Curtain/resource.json deleted file mode 100644 index 5c143b4..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Light_Curtain/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "bdd833d061840e8f5cd33c9725e8d2871c837d38a3298c499237e0cf227fc499" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "f584b44b23a60aaae0ab4f314697003bc57d0c367661d025cdb24416eda5c602" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Main_Panel/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Main_Panel/resource.json deleted file mode 100644 index ae4328f..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Main_Panel/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "418ff78bb1b63766acd42b72abc849df8e93a4b6c67f0bc6ec41494ac90960fc" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "3b8bdfa25f6dbd5f24e3bed4a23fdaa432871898ba90c051616b0c39244369c6" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Network/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Network/resource.json deleted file mode 100644 index 0e5892f..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Network/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "7971d53778dcc4fdcc1deebb2df8c7b16685a206c635f652afb4d2a2be5bdb42" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "4d7757561ac982797c6274e078624ce5d0584adc636fa802477bd94cd798f891" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PPI/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PPI/resource.json deleted file mode 100644 index 9c1f0d4..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PPI/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "652e271236bf659dd837c3783a83a6e569cf3bb9bed1cf8e14f0b7b11930ae88" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "7f889f07bf272de4132b39da25717beceb222eccd4206ae96f550687beafc35c" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Photocell2_Lift/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Photocell2_Lift/resource.json deleted file mode 100644 index 9a9838b..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Photocell2_Lift/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "1ae83d8b5cb6349fc437dea873a7eaaba8a2a1025f0359d445c51d9b99a709b5" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "fbb97fe644ca76093937a1428ea0106da41f68877e0521488ce14dc0acda7735" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Photocell_Lift/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Photocell_Lift/resource.json deleted file mode 100644 index 89a232d..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Photocell_Lift/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "f2e56d635366c5f05a246c327a2c536087345e97e1d3bab6216b66ea7cb09a7a" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b548224443267eb673f5739618c939aaa9b96ae5a4b6ba4444ea323a2921699b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PinDetection/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PinDetection/resource.json deleted file mode 100644 index 5a16dd8..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PinDetection/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "911ad5e88959207f518af7f5e0784e7cab8951c14ea815eb6f319e1edf0a86c4" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "f20549a4ee36c2290d1e784794e5600c5e489cdbe05c17f23c0f7e3a5a1b70b9" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Pointer/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Pointer/resource.json deleted file mode 100644 index 0de733c..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Pointer/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "362161779c5622613875ea7d7a49409e59871ebb09355e7a4648ed15dd3b06c1" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "ee72687599a935bf7197f0ab8c1d82dc5022bdb7a619f8d8fb21ff73184c53f7" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PressureSwitch/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PressureSwitch/resource.json deleted file mode 100644 index 3abd23c..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PressureSwitch/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "e31e1e7865985c80349898e047f372a1828d80f91f17dd17c624278f9ffa1038" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "9a5bfc2fb2028bd815bc70fcb0414c54810e584a0187c9fd095326e711bdbffd" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord/resource.json deleted file mode 100644 index 77dcfee..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "49c51af5b66266156a3592cb854f80c760f55443b35f67ec62fa099e23737b0d" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "9dcf3e6bbd6dc4b72d04a5881a1ebfcc7e7279ffbc40e32b877e80de62577537" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_End/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_End/resource.json deleted file mode 100644 index 6ddb48a..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_End/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "a135434cc20a3cfb6533cbda9be2e2fe5d0c111ecaa7b9995e44859c6ca1a24b" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "824e830e2514769837bb397eca773678422ef215ead0a387df72ead767d61766" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_Line/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_Line/resource.json deleted file mode 100644 index 3d8180a..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_Line/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "bdd204ef81a2aa2396eda15a544c39ab7aeccb3728a4b336ec3fac62b0d5db0a" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "52d49b95749dd8f2d72d845949f4146a772f7167037464c03a3ae104f58e677d" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_Line_Vertical/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_Line_Vertical/resource.json deleted file mode 100644 index 8b94156..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/PullChord_Line_Vertical/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "d6ff9169e7289a8f2ae8ea437c43a1f2a994f5529cfe64bdabd264187fbceeda" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "9a72dd3b2da50a52f446a370e6cf96c3234e790ac71e8d6e3f642a3d4081404b" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/RFID/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/RFID/resource.json deleted file mode 100644 index 6a5e70f..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/RFID/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "784e212b5f31827d385e68663b3d9aa7fa93220eaa01667939238bdf3a7994db" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "ab0405be3a36856c24b36ec04a4604ff9c3f582d6d9c98235a8258d643c5eaac" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Robot/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Robot/resource.json deleted file mode 100644 index 0b56ddf..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Robot/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "ede8ba9aae3fb89eb6912b29865ef4d0da995858a4ca6e99d08e5fdd94dfa518" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "08ef2a61b227872418a2a0a6c7518702172ad95e504cc8f8f5b21c638024ec5d" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/SLAMs/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/SLAMs/resource.json deleted file mode 100644 index c5aa73a..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/SLAMs/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "9993e3df679304dc8cb7399cf3f6bbdebfc22ba684924816e2a6ff8720a9a2a9" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "70c8bdc595e73266074bc0d0c53413ff5636644bef762811654d2c7a905247a8" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/SafetyGate/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/SafetyGate/resource.json deleted file mode 100644 index 8935a64..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/SafetyGate/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "33502427d5a9d21e00ee32c717a92a961f4cc86529e879a8f0a60bbd3c2a7db2" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "9f936f932b44163bb5218d198537d96a9b4792048ea69d1f8e85d827e14a568f" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/SmartPac/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/SmartPac/resource.json deleted file mode 100644 index bb15ca8..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/SmartPac/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "89d65cc9749cd59399e5bf3c5af39686f150a109e33a63f894d51e3767d769f7" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "7a7826cdd90b8f245956eecee97b1767d97aa765961ceca881a37d2e4696b528" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Spiral/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Spiral/resource.json deleted file mode 100644 index 37c7211..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Spiral/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "7bc80ba1eb608211713ea646f77fa65bd73ac0917017e45bb2fe2e6132cc6278" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "2fd5b497d64418cc652af7b395083395a998508e64baae3d8551e23570ba7dde" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Stacker_Destacker/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Stacker_Destacker/resource.json deleted file mode 100644 index e8f7bee..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Stacker_Destacker/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "de9bb9e7858118e11b1c8c0186de8dc802fdb43b5e9a524fac691fcc799b996e" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "f57ea81b1dc7e83bca350c3b5eb0ae84d5ab79889c8488b8a027af9d664c0477" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Status/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Status/resource.json deleted file mode 100644 index d2571d6..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Status/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "6cdde90dc16ddc42b06a10c39a44b0472d8df86fa5835cd4c6f0f06c082451ab" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "ab7896ff857ae59fc36f12b02402aeae806f2d81b415931fa48def8fbbfdb66a" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/StatusNonPowered/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/StatusNonPowered/resource.json deleted file mode 100644 index f051894..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/StatusNonPowered/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "8c86eb145488b332ddfed52da6ec2dd9a8d517d0ebaeb5e41e43979a0c3bc9ff" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "1931d7c6c4d72a72eedf542b54811bc6b461279dc3e32092852a4fd8b45fd6e3" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/StatusNonPowered_NS/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/StatusNonPowered_NS/resource.json deleted file mode 100644 index 941962c..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/StatusNonPowered_NS/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "48566ad987b06c7b10eb09d17ad5cf63b4d056b5d2c85ed6ae29752a058853f9" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "a3c1daae8af16b011da5b93a38d34dcd67d1f64f096b255356ab066c2a3763ff" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Status_NS/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Status_NS/resource.json deleted file mode 100644 index 914f0bb..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Status_NS/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "8f6c534fd5c3303ff426a4f802239654a701e07eddea2678985796d1f486fad6" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "c1faf3b37ac5c24dce70e4cd84735df4c250e7912542cbbbc19aa69ed34aefcf" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/THEA/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/THEA/resource.json deleted file mode 100644 index 4737a71..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/THEA/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": false, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "215e5e4f1e30aa9a57b42e2978cc11c9ee63c134a1a488368784a8d4ffe7bcee" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "774aa512c5cb95950ea32184d9d85344f66319a3beb05ca4a3fec93b0f82004c" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Test/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Test/resource.json deleted file mode 100644 index 04f1ab8..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Test/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "87fac5b21fe288ac60ec110d7124016e0d12956b9f26a6d17a543d29b9a5bdbb" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "689a6e19bd4fd411c03e0a1da9e7168f0552180df2a20c14588a6f3321eadade" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Selected-Symbol-Description/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Selected-Symbol-Description/resource.json deleted file mode 100644 index 6df0771..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Selected-Symbol-Description/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "6cad924ebf26fab39f225eb1b39ff702e29a352c17e9a7c85d220b0d61ac62a9" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "e694f22aca5e72fbaea086dd04130bdf5b3c98b2763e5a1b40d6f77959d82b97" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Symbol-Filter-View/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Symbol-Filter-View/resource.json deleted file mode 100644 index d012789..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Symbol-Filter-View/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "3a279ab0fafe7a5abcb12341ed0b434d6c2b3d1b991fe989d2b1a6eaf278931d" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "8bddef63cae6991576285b5cb8e3c1fe3accfe40b94a3c7afe8eef4d82db1f06" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Symbol-Icons-View/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Symbol-Icons-View/resource.json deleted file mode 100644 index d6c3bdd..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Symbol-Icons-View/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "83e0602b8546e91cf43e468c6a8571d306d9cdfeb5da5722513c471c54fa1ae8" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "68c70effc498bf737782225369637481e5d7094fc76e871c6376b56e973da110" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Symbol-Information-View/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Symbol-Information-View/resource.json deleted file mode 100644 index 9e7f78f..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Symbol-Information-View/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "e71553ea422a73b9680f36e12a214a3525717576149d6f0d1f8c978f24fbddf5" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "9cac0646c8b475fde11c492dcc4b4869d428dc2d878e7221da023347e6a075c0" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Symbol/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Symbol/resource.json deleted file mode 100644 index 36816e1..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/Symbol/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "dd21a58f5ae5d2f21926e7330d01aaafd20487b057625c099079e9273217a536" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "22443a466c18dc2ae3518f9c5c08cc2cf88de5cc54d19a10bfc6a9dc1f73de16" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/SymbolLibraryMain/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/SymbolLibraryMain/resource.json deleted file mode 100644 index a6e867e..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Symbol-Library-Views/SymbolLibraryMain/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "e2b203360e29465f784df5c1506aaaec0493d8e78f2c78d130f9cb84bcbcb828" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "81c9970a7eb552e50f358e34965e2c57a0527bc5e22c881f616d56015b6e5eda" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Test/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Test/resource.json deleted file mode 100644 index 154e973..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Test/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "view.json", - "thumbnail.png" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "06f7685ebde8ed0b3a6e6d4c355b06321c8be404e6cfb42d68ea1de0fdc581f5" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "e9eb1d8bd13fa446a9a0f33d5ff3e664008de0d3d1cfae717bc06dbdbfb82449" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.vision/client-tags/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.vision/client-tags/resource.json deleted file mode 100644 index eca335d..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.vision/client-tags/resource.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "scope": "C", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "data.bin" - ], - "attributes": { - "lastModification": { - "actor": "pllincol", - "timestamp": "2021-10-25T07:43:53Z" - }, - "lastModificationSignature": "9507094e62bcbd4b5c0d3a9ca915ea0954abe4004aa32cbc6a7d373cbe6de012" - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.vision/login-properties/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.vision/login-properties/resource.json deleted file mode 100644 index b7da9ba..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.vision/login-properties/resource.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "scope": "C", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "data.bin" - ], - "attributes": { - "lastModification": { - "actor": "pllincol", - "timestamp": "2021-11-24T13:55:44Z" - }, - "lastModificationSignature": "0066d6e08e8bb4a7b4004ff036e1cc20059cb343100f6663306727267350e4a6" - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.vision/templates/Site Specific/Reset_Start_JamReset/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.vision/templates/Site Specific/Reset_Start_JamReset/resource.json deleted file mode 100644 index fb615cf..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.vision/templates/Site Specific/Reset_Start_JamReset/resource.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "scope": "C", - "documentation": "", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "data.bin" - ], - "attributes": { - "lastModification": { - "actor": "pllincol", - "timestamp": "2022-03-28T14:21:52Z" - }, - "lastModificationSignature": "5ae3323c4a58d2268bd5df7bbdbae9a7f0836d6d2918471fafd90f03a5499b26" - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.vision/templates/Site Specific/StatusControl_Bar_Has_Role/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.vision/templates/Site Specific/StatusControl_Bar_Has_Role/resource.json deleted file mode 100644 index 101668d..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.vision/templates/Site Specific/StatusControl_Bar_Has_Role/resource.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "scope": "C", - "documentation": "", - "version": 2, - "restricted": false, - "overridable": true, - "files": [ - "template.bin" - ], - "attributes": { - "lastModification": { - "actor": "pllincol", - "timestamp": "2022-03-28T16:42:16Z" - }, - "lastModificationSignature": "873318c449bc056ca3ea412c1226358696a9df9888362c23cfda3cd08dd41551" - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/event-scripts/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/event-scripts/resource.json deleted file mode 100644 index 01766c6..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/event-scripts/resource.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "scope": "G", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "data.bin" - ], - "attributes": { - "lastModification": { - "actor": "iama", - "timestamp": "2024-04-11T17:40:08Z" - }, - "lastModificationSignature": "d844fab616a878fd8472c4b6f0bc0a0433de7e0404dc64629a56773ccb66ab63" - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/global-props/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/global-props/resource.json deleted file mode 100644 index c008178..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/global-props/resource.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "data.bin" - ], - "attributes": { - "lastModification": { - "actor": "pllincol", - "timestamp": "2023-04-21T15:08:08Z" - }, - "lastModificationSignature": "7dbe6200644bd330386c248e0ca05e72c3931f3dd75b4996630910731256c342" - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/named-query/StoredProcedures/GetHistoricalAlarms/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/named-query/StoredProcedures/GetHistoricalAlarms/resource.json deleted file mode 100644 index 40d0178..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/named-query/StoredProcedures/GetHistoricalAlarms/resource.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "scope": "DG", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "data.bin" - ], - "attributes": { - "lastModification": { - "actor": "pllincol", - "timestamp": "2021-11-22T21:28:09Z" - }, - "lastModificationSignature": "1ce3d225e5a61a7b05dd7cfcd3611afd76f98520e6f3703ff149bc48304938d3" - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/build_url/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/build_url/resource.json deleted file mode 100644 index 32f1700..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/build_url/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "533062d81cf18ead81344eff88c29d56efaf37187a1c7a774c0482090b9857ee", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "24d48cbea3455933af9cfefa3dd16ab726e8e6b3c0f39f95955051512c10c553", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/build_url_http/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/build_url_http/resource.json deleted file mode 100644 index b98231e..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/build_url_http/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "a56a24e2be3a63baf79781729e593e528b1e500915418a1e6da1e1e72d04d2a6", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "62f64537d373f16503b50a3966df935792e83579b3b8a6f49a228d99e7ca6aa8", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/create_tags/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/create_tags/resource.json deleted file mode 100644 index ae4f190..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/create_tags/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "d0a76cfc78cbc3f927e0367fdb85f0fb83726051684c79f15ef244b7356c0216", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "73d5a3d279a5b89490183e379c0283c39d921a0710d010dbed89fcbc879d3960", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/credentials/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/credentials/resource.json deleted file mode 100644 index 8793934..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/credentials/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "dfb166badff03d0845e9b32a33af5a89b0b3d6986ed3e7ead793887f34a314c5", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "8a80ab8c2fc67942ab7a60deb283a45ebc7a742bd7b72194abb43235d5cf6a04", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/errors/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/errors/resource.json deleted file mode 100644 index 619b6fd..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/errors/resource.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "hintScope": 2, - "lastModificationSignature": "308be27cca20960ab7878aa4e5ad24563b2beae51cf4e07724d792e0202f8cd0" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "hintScope": 2, - "lastModificationSignature": "d9091e2653ef3dfc5828c6326ec7b4315040986dcdcf2ad2a81e530180fa0331" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/heartbeat/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/heartbeat/resource.json deleted file mode 100644 index 02cff31..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/heartbeat/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "4581458064f6af0779195a3968c833677c5925006ee8ca83f7287eb4233d98e9", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "2a709429de77dabae0d44ff020420e64d9e71c5366e1a036dd3f9b766191b5aa", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/message_types/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/message_types/resource.json deleted file mode 100644 index 282670d..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/message_types/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "baa28511f1b6d09537c7a61b3e1c493aac4370b371ce71e6389149f6c55f1379", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "05928ceeca536530e4e685957e8069c577f0378f820dfd97b0da9093a894a3bd", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/s3/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/s3/resource.json deleted file mode 100644 index 54dbd44..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/s3/resource.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "hintScope": 2, - "lastModificationSignature": "1e639c910fff0cb6f001e5252bca7f9146863086c640fdc4b8a8c87ee9abb007" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "hintScope": 2, - "lastModificationSignature": "162a806e99183e69afd385b4676eeca2c21a74deb25b68b95988197a9f669538" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/secrets_manager/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/secrets_manager/resource.json deleted file mode 100644 index 67f490b..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/secrets_manager/resource.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "hintScope": 2, - "lastModificationSignature": "7c7ad71cad1726cdd6236a020b75028e659978754b666de6d7a1d8e5c5e86b31" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "hintScope": 2, - "lastModificationSignature": "bb5121da5fdd529282d283c375c8c589095e352383a2d1c530fc58db6f7f1e57" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/wbsckt_abort/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/wbsckt_abort/resource.json deleted file mode 100644 index 69ae34e..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/wbsckt_abort/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "d874c7db46661a9702c6f996b623ee9e786caecef5db4b1fc3aadf4589bf2ccb", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "87b0ce4a59aef77cbfde3a61e482fdfb5d5e9b82fc5bfe465e0f0b69083407ca", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/web_socket/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/web_socket/resource.json deleted file mode 100644 index 4bc0576..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/web_socket/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "881dccf1703800f4cec2d3fc117885ccc43f011c1f2d944459cfb8350fd5dc74", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "c016fb3c9a13e22bb00c0afdcfcc79be736a19ed2176077367651075413085db", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/web_socket_send/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/web_socket_send/resource.json deleted file mode 100644 index 36cb15b..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/AWS/web_socket_send/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "93aab939ab56b477bb4cfd4205d7842d14fbd504b62aa69117d5ba18c4dfad31" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "6efbac41afa672e912a9af87a096a49be573fbfda704c00482f0aa68f4e1249a" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Alerts/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Alerts/resource.json deleted file mode 100644 index c847a5d..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Alerts/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "4680b2648874a7a9733996547e66e2bf6aeaee5bfcc189e22e8c5e23a9776a31", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "8760862f19269beed428733eab9fd2b032df1cab8ff63580a64f953f9b744f61", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Commands/analytics/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Commands/analytics/resource.json deleted file mode 100644 index 00d14b0..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Commands/analytics/resource.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "hintScope": 2, - "lastModificationSignature": "c518138135008aa125c4463ec5296ff5a7cbfd0a4b3203fa5035169c587c17f8" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "hintScope": 2, - "lastModificationSignature": "43262c4895e2baac9cd088d32343507b4782713958986c62d1d7d6c4e19b97c4" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Commands/button_commands/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Commands/button_commands/resource.json deleted file mode 100644 index a0d210a..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Commands/button_commands/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "fba4cba66b0469fe05c0ac7d414fd31761dc59c09261079ba592a19e83d707e0", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b3d631c91e260e3a83a21de0b66849b1224d0f30723bbae56635ac9781f257db", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Commands/shelve_alarms/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Commands/shelve_alarms/resource.json deleted file mode 100644 index a1d8bf2..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Commands/shelve_alarms/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "58daae7e8d9fdc2ba4fdc3dd24860d2d8811c07256ef2f31c1fe96f60dcd2e15", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "6fe0ffabf275da0b2348d7913fd0d9fd8ca0cd2436899680ff988a079787c9d5", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/DocStringTemplate/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/DocStringTemplate/resource.json deleted file mode 100644 index 9af93b2..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/DocStringTemplate/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "2161e0dffe834bc573a147d7794268030f2626fba3a0829e4148433f36494154", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "2f96b6d06bbfb141b94b4bd767c94402114b59b5dc036eda71d3333901caf655", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/FileHandler/downloader/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/FileHandler/downloader/resource.json deleted file mode 100644 index 0196d1d..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/FileHandler/downloader/resource.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "hintScope": 2, - "lastModificationSignature": "3d4e1521384952fdc11ec9a43ae71a78898c0aa27d392ed79776c2d988c8cf57" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "hintScope": 2, - "lastModificationSignature": "1d4014ee2735a3eec7703c786d171002abaee886526c74e424a7c4a736bf51bb" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/FileHandler/uploader/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/FileHandler/uploader/resource.json deleted file mode 100644 index 473f857..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/FileHandler/uploader/resource.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "hintScope": 2, - "lastModificationSignature": "10e496f2221881ed99aaaa43c9c4bb18156ced0441a59aff73df8f02721d38d4" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "hintScope": 2, - "lastModificationSignature": "12cc215bf26d41186c8badf3cdc4d8d099e3879578886b8ad9b27e841aa8e487" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Gateway/timer_scripts/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Gateway/timer_scripts/resource.json deleted file mode 100644 index d0b3628..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Gateway/timer_scripts/resource.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "hintScope": 2, - "lastModificationSignature": "a100f18f5bb2ff5574a11a8bb3e2644e81c5ef024dee55a561572e9b1ff2b7da" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "hintScope": 2, - "lastModificationSignature": "980f47a278302d85a661539d1a354a255196d4f3a44996dc10c91759ca435525" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Latency/CreateLatencyTags/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Latency/CreateLatencyTags/resource.json deleted file mode 100644 index b38e8da..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Latency/CreateLatencyTags/resource.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "hintScope": 2, - "lastModificationSignature": "56e87cb0044f5ba539db527f52472861f05dcc1c8eb4609953d3d4f71bbc674b" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "hintScope": 2, - "lastModificationSignature": "0b6c7d57ecf067a82d63be8ea33fd43ced002a52029bff288eca294b661dee82" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Latency/LatencyAvgCalculation/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Latency/LatencyAvgCalculation/resource.json deleted file mode 100644 index 2cc3eab..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Latency/LatencyAvgCalculation/resource.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "hintScope": 2, - "lastModificationSignature": "f3892aa157a121ee8ec5ccd5f9032cc8c8224a88155ba56905d911e8b9ed4be7" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "hintScope": 2, - "lastModificationSignature": "9e099c3ee7ca9ad241695d66aef70122ea6e581519571f188d2d08d250510aa4" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Latency/LatencyCalculation/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Latency/LatencyCalculation/resource.json deleted file mode 100644 index 90b8599..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Latency/LatencyCalculation/resource.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "hintScope": 2, - "lastModificationSignature": "dff4b8649a2b69879429bcce30da45a67f5ec83b2e5a9fb461c24afb0f1d97e5" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "hintScope": 2, - "lastModificationSignature": "7b13dd2622dceffe9cc9485dff126f01df828f4f6c509b369b7401b72879ee36" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Latency/WriteToDynamo/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Latency/WriteToDynamo/resource.json deleted file mode 100644 index 3f321e9..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Latency/WriteToDynamo/resource.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "hintScope": 2, - "lastModificationSignature": "beded8ed00a5090deb23a171cf128d54c27f53d16f34fa7740f7d6e7dbded40d" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "hintScope": 2, - "lastModificationSignature": "394225072130bb05c476503e9bc72409d2a237308ea3861f1d5b8ca200412061" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/SymbolLibrary/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/SymbolLibrary/resource.json deleted file mode 100644 index 2bc6f51..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/SymbolLibrary/resource.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "hintScope": 2, - "lastModificationSignature": "50a8af87fab4505dc9a9b48f9b87fb4b26da6a2fab4fb1a0bd8f909b9e9bb416" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "hintScope": 2, - "lastModificationSignature": "128b4bab2d51c32052d1d467e473fb3f4e28655dd0d1ede87dadbb64fc9e2b0c" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Visualisation/home_page/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Visualisation/home_page/resource.json deleted file mode 100644 index ab30973..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Visualisation/home_page/resource.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "hintScope": 2, - "lastModificationSignature": "2d0753c10e00be0a384e87738ee0fed899072ed7c1f78a67b09336dea5ae8bc0" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "hintScope": 2, - "lastModificationSignature": "30d71a9637f8553fe20ffa60bf8ac71d7d9c2b4691d72b6e788263ea16ae0497" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Visualisation/status/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Visualisation/status/resource.json deleted file mode 100644 index 721690d..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Visualisation/status/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "16c3d9b875d0db424b3c4ca2eb5e0f5f35d91e119162ef7d396cd1e845f8b5bf", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "6af52a420fb3cde4109dce1d5db7dc75df5be6e1117822537990de4e0350549f", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Visualisation/status_2/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Visualisation/status_2/resource.json deleted file mode 100644 index 6a44f83..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/Visualisation/status_2/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "a0b6192a7f0e42ea5f202de58175c45651741a8893127e4bed357e3929a39b26", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "7c5960050305b6f0150e64441829db667869536d0ff3cdf5d6777c42ad9938b1", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/activityLog/logger/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/activityLog/logger/resource.json deleted file mode 100644 index 9b93f47..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/activityLog/logger/resource.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "hintScope": 2, - "lastModificationSignature": "edf848802edd8cbfa7ab789fb6638a37c2d4f3a72ebcf93ac4773a7044d9b81f" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "hintScope": 2, - "lastModificationSignature": "878c3b0bc9427730cec39dda6e04ae4e1df20462a337ef807c5e449c59b7653c" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/activityLog/productMetrics/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/activityLog/productMetrics/resource.json deleted file mode 100644 index a3b0350..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/activityLog/productMetrics/resource.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "hintScope": 2, - "lastModificationSignature": "b961913ce4b8421414c86d89616464b5282f815e6dac63add4c7e7719f4b5b3b" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "hintScope": 2, - "lastModificationSignature": "d8f03e9a9e7376fe2eb7439a956679300704c65bb0b8121bd9f23a466661f933" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/alarms/alarm_count/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/alarms/alarm_count/resource.json deleted file mode 100644 index 26588ab..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/alarms/alarm_count/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "2a672089affd2f928119d4485703603f78153695d938c7ad4cadc43fa72b7435", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "3974216abfa19c207670be1806df6c8763b3be4aedcc3301886ef845d827672d", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/alarms/alarm_filters/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/alarms/alarm_filters/resource.json deleted file mode 100644 index 4030408..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/alarms/alarm_filters/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "d2ed2826e3cf2b21e66396d3e8aa0d8af7be0575d652e76d46f42585293a0e2e", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "9d05975346c2dbdf6c194935df58ecced52502dc24e00a97f1d5a29ea4fb638c", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/alarms/alarm_state/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/alarms/alarm_state/resource.json deleted file mode 100644 index 77321ac..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/alarms/alarm_state/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "cdf99039e7088ae9cc16b60ec657ae0941fcdfbe777d6bb64f7b33a7a02b33dc", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "e0f5cc1990b19ac2eba792d17f18d36747943c776c6ac9b6a6373ceadf207494", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/alarms/alarm_tables/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/alarms/alarm_tables/resource.json deleted file mode 100644 index 2ac4864..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/alarms/alarm_tables/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "09b291eec3b4062c3c7725ef9b1fa2bbec350d0ee0a50c14e6cae2bed5d869ca", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "91750148e5a10b7911bb439aec07db302458b9dd77ffa760fdec13714eda6a42", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/alarms/shelve/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/alarms/shelve/resource.json deleted file mode 100644 index e119c06..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/alarms/shelve/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "e62b8d3624f5e7c085eecdb27bad8ce1f461c142fcfdf96bf97febdd160efe34", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "464369967c17d8499370630a0a2f3fc31e06be72964cff80c7c754ec647824a6", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/config/project_config/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/config/project_config/resource.json deleted file mode 100644 index 94bf2a9..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/config/project_config/resource.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "hintScope": 2, - "lastModificationSignature": "6f0f491814fb998583935046c840d899a3a9fc9bbc2eb0471edd5ba43af7514b" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "hintScope": 2, - "lastModificationSignature": "3e38280ab1bf3ca094b5c0bc9d260a5eaa74bc686a5ea1ac2c9d8da1bd0a63b5" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/helper/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/helper/resource.json deleted file mode 100644 index 771c00f..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/helper/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "1842915a785a2672d321d7793a6638023ef1d011ed9aea20b5db88102567950a", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "5b36b66c6d37d7cb3a30a7e91771d287d057d22b40a06de09d62a19973997b5f", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/import_file/csv/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/import_file/csv/resource.json deleted file mode 100644 index 1997845..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/import_file/csv/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "622db16e58a19e26db34009bf7f438f3228b8057fff6d87704043a2bdeff3d7f" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "8ca05593568e095c48ad9b0e47ae7bdc5eafa2da8a1e8a5dd5567262bc31ce29" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/loggerConfig/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/loggerConfig/resource.json deleted file mode 100644 index a220be0..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/loggerConfig/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "e112b9abcabb862e3af2acb2690bca538dce5c96bcfa3b397c9b67d1985e0979", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "cd45371a0568010f94cbb9c1abfb3039d57cf8a5fbee320135faaa16d1e257e4", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/messaging/message_handler/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/messaging/message_handler/resource.json deleted file mode 100644 index cf40c86..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/messaging/message_handler/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "eead16870e740bc3088af5823c823c57e87e6af26567585603167aa40f307e7a", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "6474db7066ddeb58739efe3094bb48fdb0fba066621f70a17c3827a57a5fe18f", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/additional_view/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/additional_view/resource.json deleted file mode 100644 index 55dac7e..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/additional_view/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "bac046c673fd636c3a7a1cae11d577a7d09e357b8788a05e07b120dc098f2f52" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "3173b399d2c6ff8dfc4f99247e81276cd5de981e1d90c046924b945603e5e032" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/alarm_navigation/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/alarm_navigation/resource.json deleted file mode 100644 index 3a96084..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/alarm_navigation/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "c12c633a95e169e5e80b253083fcd255a3eb3540e9ea25b89b6cd4eeeda67743" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "913b95a579010ac7d53e0a1122a15fe014d5d2db46831da40a697880acbdc66a" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/amzl_navigation/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/amzl_navigation/resource.json deleted file mode 100644 index 1727a80..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/amzl_navigation/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "2c3330b8ee35e9779c06836e608656757ac1c9ff870b4d4ced25b5664b924ad5", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b171bd399f13099b6980f184a17c32ed90384902b31362e0a0e87982b2350d89", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/basic_navigation/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/basic_navigation/resource.json deleted file mode 100644 index 1aa7a9c..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/basic_navigation/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "252d8bb65bee9b1889935a4f53ee9954b7c6e89b5a10c9bfcd6b6a668894059d" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "4b18fa01e1916c25ecb3ede67a0f6779e5a0d9da2fc8191afe08925465e04488" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/navigate_to_page/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/navigate_to_page/resource.json deleted file mode 100644 index 36f6e7c..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/navigate_to_page/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "2fa25a32ba5f15719aef7b6948e6bc12600e497c4bcb57840f714787d43ae94f", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "40058a18d81e43b3518010123a2cb918ea36e6511cdf311af263ddf4502ed9cd", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/search/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/search/resource.json deleted file mode 100644 index cae08ab..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/search/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "6628afca3567578fd50722f631d8c3c21ccb8639dc9956fc8115b68afa33e210", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "e27e5a78a5bae739b144b8fbf205884704956b6ef1574b5e98b1e77801a44773", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/show_alarms/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/show_alarms/resource.json deleted file mode 100644 index 5f4e964..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/navigation/show_alarms/resource.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "81ad866ca57a16093cbdf89a44ad9e092c8fe68bd4fe68c08c5311eb2422c9db" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "b46f57d52206934fadbd485208bc2d340a89c9354259e3ae47bb222311daa5f8" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/notifyTool/DeleteFromDynamo/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/notifyTool/DeleteFromDynamo/resource.json deleted file mode 100644 index 9e106c5..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/notifyTool/DeleteFromDynamo/resource.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "hintScope": 2, - "lastModificationSignature": "7394148e86ecce2d8207127273325fcefe8b804134b4dbaa22a9bb0515c07310" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "hintScope": 2, - "lastModificationSignature": "70dd2e4f9b25df4277d413b7bf91f0afd57e8a8a7003ba44ba10815ad45a0268" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/notifyTool/ReadFromDynamo/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/notifyTool/ReadFromDynamo/resource.json deleted file mode 100644 index 2685f78..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/notifyTool/ReadFromDynamo/resource.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "hintScope": 2, - "lastModificationSignature": "dac20aa2a9ea0cbbbe9fbb1815fda5b817e9a015a582be51280d8e2641bd09cd" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "hintScope": 2, - "lastModificationSignature": "2c3c2e2adb552b8881e91bf713f2ea702c393516e9c626d37453055296e28433" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/notifyTool/WriteToDynamo/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/notifyTool/WriteToDynamo/resource.json deleted file mode 100644 index fe11ee4..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/notifyTool/WriteToDynamo/resource.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "hintScope": 2, - "lastModificationSignature": "6c90f2b80954a75146146cd1cbc3278cb5df73f89982d18d8d4c366c39d9fdf5" -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "hintScope": 2, - "lastModificationSignature": "b20d94651147ab8f4e547cb6b7a5ebd43a76e3b5b9b67342e3d8383419fffb3a" ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/row_builder/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/row_builder/resource.json deleted file mode 100644 index 857dd4f..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/row_builder/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "742bb764260784e83415993299bbb4578b0d411c7fa94c7820066a272da684e1", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "093bc44046230eefc3b3d24c705c150357691444311a4b1c8b2fbac4bd0334c0", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/state/state_tables/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/state/state_tables/resource.json deleted file mode 100644 index a6885e8..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/state/state_tables/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "a566be8e78ed152a106ebf499568226c27c4d1fdfac342ff72dbed56466f88cc", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "60aea0b3ce0333c4e2efbe5947123cc31949de562988c137157a21491e9ad374", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/tags/tag_utilities/resource.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/tags/tag_utilities/resource.json deleted file mode 100644 index 32de4a8..0000000 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/script-python/tags/tag_utilities/resource.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "scope": "A", - "version": 1, - "restricted": false, - "overridable": true, - "files": [ - "code.py" - ], - "attributes": { - "lastModification": { - "actor": "external", -<<<<<<< HEAD - "timestamp": "2025-04-08T08:59:14Z" - }, - "lastModificationSignature": "2f5dcbcf41ae07cebd91578b3391e21a79fa08bc9c1a5c0e4e50153066ee7b3c", -======= - "timestamp": "2025-04-08T09:28:16Z" - }, - "lastModificationSignature": "febbf169853558dda3c5d22bf5ddadd177e7b0d6fde86a377bdf2c1779a57d59", ->>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1 - "hintScope": 2 - } -} \ No newline at end of file