Had to do it

2025-04-08 14:01:19 +04:00 · 2025-04-08 14:01:19 +04:00 · 34cf9ab659
commit 34cf9ab659
parent dc092539ea 0a3a29c894
495 changed files with 2973 additions and 5 deletions
--- a/MTN6_SCADA/com.inductiveautomation.perspective/page-config/resource.json
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/page-config/resource.json
@ -8,9 +8,16 @@
  ],
  "attributes": {
    "lastModification": {
+<<<<<<< HEAD
      "actor": "external",
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "fd032d60357cfd6af83ed10336d316a8c04c605db6b562408517680b16e3349e"
+=======
+      "actor": "admin",
+      "timestamp": "2025-04-08T09:27:47Z"
+    },
+    "lastModificationSignature": "6890ead9afacda3dd21d1a7c848f97e7f0002e2922ece8449621878e0aa58ee4"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- a/MTN6_SCADA/com.inductiveautomation.perspective/session-props/props.json
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/session-props/props.json
@ -213,13 +213,13 @@
    }
  },
  "props": {
-    "address": "192.168.5.203",
+    "address": "127.0.0.1",
    "appBar": {
      "togglePosition": "hidden"
    },
    "device": {},
    "geolocation": {},
    "locale": "en-US",
-    "timeZoneId": "Etc/UTC"
+    "timeZoneId": "Asia/Tbilisi"
  }
 }
--- a/MTN6_SCADA/com.inductiveautomation.perspective/session-props/resource.json
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/session-props/resource.json
@ -8,9 +8,16 @@
  ],
  "attributes": {
    "lastModification": {
+<<<<<<< HEAD
      "actor": "external",
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "b0c2edad9416967d4e396616b7edf07c58e26d09de6b39d245bebe9218ce0928"
+=======
+      "actor": "admin",
+      "timestamp": "2025-04-08T09:28:17Z"
+    },
+    "lastModificationSignature": "aec710562d15836cc26d1572f9bc82451c91bb38a10720587b44366ef47124bc"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "22a2ab06bc9ee87b140100835f2170adfc0ac29b81f9922aac213f8e1e76604e"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "eab9cbe16c832dbbb54701584553038a50a435c3f2c40cd6428d9a21f78c3448"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "042c6fa18d1f98d941645b5b92dfb82d776bc85bc13d072330abbe56cba36ba5"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "83f26c834dbe18ee5c03f3bbd7bc20ccb9c021b1f449c3dfd48c3cd9457b5ce9"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "82af03b6048bd87e3d7f70d4d8614a21fbaceedea51b664cc05d4c83484675cf"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "1f308e3f17e806bb9d0c18b91b29105fd86a041c1d303d964da6560d3e0926c3"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "373addd34413262c16f6c8ff8c230d509e953f055eb48ae1133246d23a486aaa"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "aff4f9e2df4969a2bf6328959e815eef8bec24ec2208b40fd6c30c75ea88c694"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "27b5681c2e2cdd7f292f97531eb2f9bd04dc62f364cf8bb190fd8e6ead5d32c8"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "6719beac1e2961b52f8ee92e1707f887e6c5d88e612ea10dfbe9ef4ac7fb3668"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "22a2ab06bc9ee87b140100835f2170adfc0ac29b81f9922aac213f8e1e76604e"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "eab9cbe16c832dbbb54701584553038a50a435c3f2c40cd6428d9a21f78c3448"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "14702c7725ab81275a462df4b7184131f495a487898b94a53b1fecf877b3ad36"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "086b93b137d55e4bf5562c66f42a42a355926001ca906053c41999c38f266a98"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "82af03b6048bd87e3d7f70d4d8614a21fbaceedea51b664cc05d4c83484675cf"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "1f308e3f17e806bb9d0c18b91b29105fd86a041c1d303d964da6560d3e0926c3"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "afe5169e6205d134bc233ddbaefc5d67cbb5db00c568d0427def87ed64fef6df"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "953f0bf6ec39b84459904d06ce9954c8b637c7c3f7c14232f1137d8608e6a16e"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "a95fc36e1d9b5c9e97dd813156f1d79a81fde4b5b0a4afc1e16e3758d6794a62"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "f546ae2ff07b6385055219675d5379b9a96c1cc45fc12137579dfcb0b159c54b"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "6e28b92d666d1fd1cecbe8a437106bd0bada237b9914413656accc2867587c2a"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "4dbef54ec8fc29c5025eb79114830bf23500b5ccdd0264d192edf283a996b131"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "9f35a2c236ba297966088aa004b2f424db7e330d96848ed6053ea02e9208858f"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "68c9774b39182e44396cebbd943ff69614073cdc1c614192d618173479d1d3e1"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "f819a00e80330d23448fc2bcd11355a6719ab9822d5caad74df674ca466c1a81"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "597b1d7abfabae5933ee5155c11a3109bd31c583764fae05237bf397831f3389"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertButton/resource.json
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertButton/resource.json
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "714396801aa350af6a85baffebed9f534017e8f3c5060e4efcea325d52ce0c78"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "b3a828f40c06ba4f3b2ea7852db6dbba98c7c63f3af6395a43ae3f7b1966d27b"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertButtonSecondary/resource.json
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertButtonSecondary/resource.json
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "286ca9937f1cfc9af5d951a132d9a6e588ad24cc0019dd3ac0523329ae120581"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "1742fd6626c704c8171aa2650f1449e9495f4841c05b5b237763d5236c9dac6e"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertClose/resource.json
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertClose/resource.json
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "a75ced58af1e3560bc9e65edafa35f41b7a87550c6001151ebf91fa8303a99f9"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "89fa94ef1bdf1f8e05e2cb494eaa6789fff639673a89e806e3a4376b2368ba6d"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertMessage/resource.json
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertMessage/resource.json
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "189724954ee07f218e09db1b57c33710f2015f9be17e61eaa84d81b979ce0811"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "48f3c9eafcdffcdab435b1b72d828f3634bcc9f5fbb95c39fce8148845ff3419"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertTitle/resource.json
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Alerts/alertTitle/resource.json
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "1ed90dfa291f1c3edb53ce0ce5eb4d7dd512e6ed2612c97d6be6ac46c5982966"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "72bffb3daae503d7558cd29f56888838347b66f08e1a289f991d26c2e539c6a7"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "c322e368a924a03e1db915cb12ce8b6be9746f104847db0e2e7dbf98b9750161"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "d6a6cd7b51db473de34046cd6c57189b9504919bbbc28f406dabc8f7eaae98ce"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "75f11fe8617da898bbf772ef3be3c274268328295eee226708b432ce736befd6"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "dfeda8574e0f90ad5ae4b44c0455b4029293b14b9d84949513af9c000459b0e8"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "9a10d14636ee2483a07b1c7fb46997b46b2ee4fa9b006fd6150e0b118b6ce23f"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "3a433791edd2d47f0a73b4a78f627a835c93cef6933c3f8e37c525fa28640fcf"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "d1875a639422dd1115fceea9c64d93edcd76620e91b9bd37673c94ef4a054d99"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "abc31ca6aa3179f3224fbd126e8f5c07c62b1b0a83f5f0e65301fbf507f65d23"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "bd02477220c8eebeee7de8acfbf4f05d4b746478d6c2bc5580864556964dbbd8"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "b440f4e40ef48d5a77d621ce3101094c3e499bc9676c67fc4df9faf814fbae35"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "46dce566b4bb79d642bff6844c00866d37f5d1cec8c2c76943a7a988027e4d52"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "af159327f2d3303d712fe1d9e045451acc349d0f49c53288c14aee18c098e7ab"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "d00cedcbc1953061c721d09c2e5bd51c342eee33bf53cea1e8cfe37715feb3bf"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "81e0a1fe1cf955f91b3c3a251e82d556391386a2cd03f12be279accaa7f1cb22"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "c7332e447dee5072a38671b5ea17e3d5a23a162cd05454859f2e9123a4396b51"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "55f79eb06c970e5ccc7f683a9f0fb2b6c6a5c2855ed65977640a61e047f8bb00"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "5f2627dc73bb26221c15cc27779d84d6a03110e801f5882c293a24f1cfd5ec9a"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "c029a3e0079c7477837f5ce8bfda148bbcf4346cbcce34d9095455de9fe2649b"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "b9e264e622c729dc46560cdb72ad94400af7d9c19b572a31290e047c72e14b94"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "623c6e17e07439732a1d761ffa7df85a0c68bd6c72d7c7a9dd6192e119594a4d"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "dea0ffdfc5ee361b595ade35c7dbb6bff093e7fff59966c5797e469b038a41a4"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "8e4e279dff92dff9a9da86a244ef9dd9b3185c23c3b2c0b4af0edec44d4ba4ce"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "a871d1136ba8e68f553a57f33d4415fe020d7fe45fd2915a88734159525b2efd"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "41a078694d651728b12be9cca2f5579fc7dbab04dd9ee64ebf9383bf804fb2a1"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "a4c088fb7bf6c0d7e3946aca001f866bf632fe819363cf10e60a181f6202abe0"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "96c44e672b2413c49e068f2fe0cdc9d8b2cd0e36c604d353adb5cb7f999d3abb"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "b304b3e1f72246aa07b7ab069eab38777941f095b5f8c4d10b351203e553ac36"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "2c7a56b7ed39584481201711814a1516a7dc3f6916b2eb8dcfdae1cddfaa7c46"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "6e14df22ac8f79c41dccafb89011e84040e13a3fc7392d3a5f05753228d6fdb5"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "6065cc67ac7b28cc4c8795723e00140c70ffe9c08e15c036f5faa7499a96bfef"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "a4c088fb7bf6c0d7e3946aca001f866bf632fe819363cf10e60a181f6202abe0"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "96c44e672b2413c49e068f2fe0cdc9d8b2cd0e36c604d353adb5cb7f999d3abb"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "8ee7bd4b79f6e41cc81bd8eb2e819f10ec44905b89557cd6d3368545ee57ffac"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "7953772c64e0080d92342a8ca287406ddebda3253b54c17dc9b32271828f98c3"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "55d9d987670e3070f2408eef07db16cf52541ecfb6adecee0eadb533d1861455"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "63cdf8d36e393c6a546c0a4d81c92a8b87a9d5e66ec3f9da5b2e5878971ec1ea"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/DeviceManager/DeviceManagerRows/resource.json
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/DeviceManager/DeviceManagerRows/resource.json
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "55539c631e7951425e7e6297091f821e29a1e39dac3dcb68c9df19dcce69e6f8"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "7d0938951c48c8268df585bafcfef1d818c1b2f3ec99e335095aba3f84788189"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "f837ac77c45cacf2ef56006f966e64ec137a06592c02745634183e800775d673"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "b7d65cf3bb8d19578cd6d1174391a14001cb3f7a5dd0aa514c1014fb535c9b71"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "19eefcbe9720bf5f6cf656bd5f976f7493bc331d4d8e786bd355f27036fe878e"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "769324b6f4ffeef8c25e6ad657dca34853732b06d78508960af6f5c4e616ec0b"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Dropdown/DropDownBox/resource.json
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Dropdown/DropDownBox/resource.json
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "e8c75f6ed79770a060f8f1ad4329f51dd1c04c2d5ba82526f13442b7613d9e39"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "b533d27339b0f078dc1d87ef14d64f686c5292d904623c079528a1095f3a518d"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "974459e9e8d2e121448944742ab262640694a2773f58244339b0f684201716e3"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "f284831b6f985179ae6f6a45da622272315b0d4080c0e52b60342837d803bb95"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "16dac38c467156f4b45af32d1ea0ebd68f8a279e4730c60dac0b973812a1ddd5"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "68b13f897068b96cd89b1fcfcec4ff67e8e8c2d8b4c232a354054d2218aeeddd"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "43f944783897a56c92f3040458bd56d37e6b0e9177f7ed3b8ab918d4602e7e66"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "675563744d4acd29dc810d70f1a193131e178834f815c6de3ab804446d56fd1c"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "cb00f7719dae83d60057f95198e28fd01cf800509f5abeebecf477c4663e2112"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "3bbdf0340ddeca2515a694d2884c5b5ab5b808f6791337ef28a117a84f63f6b1"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "91c56eab559428eb193b064af830125eb717db290fec32c134c1804ea3870151"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "fc53536f5db680a666b814e1b5fe24124510d555bcb8ef147c46fcd961353d3e"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "1836331c3d7f2d5ba70b811f7f9b401c90a7bb21611f22ccefb3d59b8e278a5a"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "54a8840883fc968533de6c5d2aea9b67bd451f2c7a2c01154af2fdd57fca147a"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "040c04d5bc6d489b75d87573203efe5086780f17c58564eb52e4b22819b1c850"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "2c1558a3902e8c04cf8c4ea38c39d9b3742b3a9e6169a52d4ce8773ab79ddff5"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "febcc73437355ffef2d1396a4a88fb037e10ce683884cf5ce55053fbd5a209d6"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "e13331c3b72d29b04fbf5ccff90f98c36af8c0d203c5cd1dc356741542833ae2"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "b475e8e1b8aa48bad8821dde8a8fe2584b8ed6d2205a6497e4d9f9d7ec888e97"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "8616c2922b7cbaf69b27cdc40a17c47a8ac5dae710e0c055126de3c0f78d65c8"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "8af54cc404a9219334aea82b41b9cfaa0e178c93102e000d925e238e9efdcca8"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "607810e3d208ec39bfa9515d26ce4b2d238b668a3ed1a61df52f7c1cb8c1de63"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "3976ef7e4df79e3f5cf65c80a05a87c1068847be4aaa5d4fc86e67c8472cb7eb"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "4b2bfacf276e7f33047cc58b94cecc338459859236fa1c70afb578a1c2f11617"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "aeab00f511d394d3ebd34907a3a28cee590a3d60393345d4b0dccd24dc7240a2"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "2a32dea7c29e99ea89a440e87641254eba13065c50b13cc6d3da6973a401361d"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "2415c6ef07fcff83403a114ed9127a2efeff86ac4ee34f85fb7fc59d29f5d5b9"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "de7172bc2c9952343fbdaf933be54f09115d6322a2abefb48388aa2ceed4a144"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "d700365a07f90c8452ffbda3c2f565737575a659c3bedf85fd694f16f110dff8"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "42d2f212c92264ab32e7c463ad53b61e5bbd595c8c32443d857d7ec539d452ba"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "76734d73d0820a92af4a48baf2383779fea884daa9c9f84684d43639766b3b29"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "a12d6d781127a7498df097bdfa1afb7dda81d585a23aafb3e8146a2aebd72356"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "9d3cddb03d3006d0e7aa95626fd3cd9f67f5dcea4c31996aa0556e0ab05593a1"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "ceb68eb299a29dcbcd5743eedf003037247490d6a32dfad7e492515327fdae1a"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "4df86f33c002752f3ea2cf6dc0d5f08fc1f341cf44642f4993e0c92d00449543"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "b9264694f3eac0cf63def2a8be38ed8e5fcde8b78faf941b8137154773045533"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "cf70462781c5b67b1f5e41fd24c58ea868d84fd5a0a1ebd0b8823a8761f98862"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "16be2163c211658d9853c45e6c8d83834e40124f785ff0073f3a51013bc16a20"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "b206ea44d0271fdce869a30c8a2e676ee8d0c4f7d441ba25e4ee1c20c59a8f97"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "e999b3390b2641f45b6c4681a1aebf932e85c346e06eb815fecbbb81bb7806da"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "9a7939ceb7608e61e84ab871507f580c6cb44ae10a15d7c5da3cc293ead99c52"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "495a9df5ace18cff2b132cbd6bceb45dd14f8e7aefafe844080b05d3399ae176"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "dd8f09686f5d513a2e4590594c4c5b3c75bd25ae06116c7b7aca9e950ea122aa"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "91cb9292a4986c4c724cf3a949c651107c782c78020e47d1f1ab45a9bfa8f667"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "4404ee2b043a5d217b9aece32c91278f4fc9cedcf4f9c0c4afec52e2b6f77c03"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "ed1c3f6b9290025ba16d620902f6641109c1b9e0ef7cfb13e4db23159bab8282"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "2415c6ef07fcff83403a114ed9127a2efeff86ac4ee34f85fb7fc59d29f5d5b9"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "de7172bc2c9952343fbdaf933be54f09115d6322a2abefb48388aa2ceed4a144"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "4327c17f72f02b15ba7d4e397c919b2a8559b0197c88090b6aa07391152766ef"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "1042c756d2aae3bbedf278beb831ce4a6dd545608c101c7ed864ec730aae41b3"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "cf70462781c5b67b1f5e41fd24c58ea868d84fd5a0a1ebd0b8823a8761f98862"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "16be2163c211658d9853c45e6c8d83834e40124f785ff0073f3a51013bc16a20"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "6d7beda4963a3bc27e85d5f1818d7812c4cfbda507e53df164074ad2db46be8e"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "f964d10e26fb741813855883de15a2c187a5f346a02a01e679a3b5761de54003"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "0c7413318d401b25db20622e217b968784ab299993d4fd7dbd06b2d975596e77"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "443c3f8a985799f9827d5f5dcf894dde72f73656bcc720a99b454194e2e33f0d"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "fe0b39eb46c8c0c8452c24e8bfac00d85eec54ab5c73f5bac0060ce1c634ba60"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "f7406832b95930419f80fc8bb87232ed6cfcc16ff7e2add345abc43dce680daa"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "716e1d219d5bb14739872bf5872a991b095023ebbf310c62dd8a268c9e1544b8"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "ba250af82e9ff6b534d42def4416fc462e8256d1877c72525a1fd2346cdf4355"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "05a4e3bad372437b2537aa7b5e3f61c9dc85620a1c5267f3d51be67575883d6f"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "353d1f6e895a7614b12443524ee28df72bc3cf2d0faf33d5dab7bf3604400713"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "07db31e2bd3f407a5d8cd985ae0132c211b75d1d0202eb4b6e92d6e86137e6ad"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "56eefabc2c08a65f1e6a9ca639583b47f9e3ef72c8e79c4f0120d93ce3668adf"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "07db31e2bd3f407a5d8cd985ae0132c211b75d1d0202eb4b6e92d6e86137e6ad"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "56eefabc2c08a65f1e6a9ca639583b47f9e3ef72c8e79c4f0120d93ce3668adf"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "33ab8342d1f6fd414a6cfba0ec7f42389b5f266e1c35e900005639b4534801b3"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "14e2664998fce713f5eb781e239bafb64e055944bf89c5c06008b52ce68ee315"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- a/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Labels/Label/resource.json
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/style-classes/Labels/Label/resource.json
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "eeb0f47ce0b296f4cf37d230673c7da533aa93842ba8886d58a724cf7e7e193e"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "4537a8ffb735fdfde7ca2ed392f2d8b5242f175ad0592654014a138098c1365d"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "4bf87224975b175b180cc625ebcbd287ae105f286d3982563985d35e83fd5092"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "d71c4bc53b1ad816b63dc88de7678244ff70c504c9feb1428366dd6b2fbe35e4"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "0359baf0953f470bfe754aaa651b9d0d8eee5c171775407e5361ed6b2bf7264f"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "696a34b42a46f5c8877d88770077a0002dc40423710ef088b5dd70bd88029b67"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "cf83ae8c01c91cc7d25377875ae8b5b6939140ea83c620348730fd3b718d56aa"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "763ca54255054b405500b5e9821fed68e7c15d6606c8e41dbaee255ae5f60ec6"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "6accd9d18f40d9a1e3e73319aa8ae3d89dd5a4cc61e07d9665c903438507893f"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "c6d565f6d9d7e1486a3a23af50404ffb8f957a17cc43ef1880c4ea141a566e5a"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "19577f7ebc22743bf08b05bc14a2102c8bcc5215eb17bb20251543e7facfd1d2"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "89b67366db982d45417263469dc6ebb4754ed735d81c8b2e988bf8ae48781889"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "82af8e05410881086cf4682cd97e07a80bf057f6693e28deb733e580fd7c7a1d"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "1138a2feb5d9b21d97cd71085ef2edb7d9aa9dc470f241b6c62c5a1e43ef6578"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "bea4cf807431b794039a981a4da353124ea3d8b57bb368802fc51fc7331408ea"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "97213fa1880be55f9e65379a77f9c3ade2a645216c3d6176ad0ccb484061add3"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "49912130a378b6780fd21694baa30a3392bbe9d808fb68722cb50bc0bcea6204"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "c1063b49f652d9d808153be13a2fe57bbb7228901b3171dee3d6a270c2b80f2b"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "e29f696b4dd9714f4799a9f6eebe918a1dbf892f6f0ee8a583a73ad51ec7e377"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "944a41a1f530c1aac938bc43b0fca6c5a8594a4cff6c077b98fde42cbf7f2f54"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "5eb8dc7797cdad8d0075089d1cfb8c50f3affcfdd183743135b9e38f96770d53"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "b3a4a6aa45796677b6dea5e14795b20451532ba247959c34a32fc0ed8394feaf"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "315acc11c701143c651ee5435b70724cd33cc672c5036739f89e9a47bfad2652"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "ca633d5a182556c28f58d6cf0a75a8d876d7ed2f4bfd5ad4fab3eb435e6ee1c0"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "82af8e05410881086cf4682cd97e07a80bf057f6693e28deb733e580fd7c7a1d"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "1138a2feb5d9b21d97cd71085ef2edb7d9aa9dc470f241b6c62c5a1e43ef6578"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "bea4cf807431b794039a981a4da353124ea3d8b57bb368802fc51fc7331408ea"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "97213fa1880be55f9e65379a77f9c3ade2a645216c3d6176ad0ccb484061add3"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "bea4cf807431b794039a981a4da353124ea3d8b57bb368802fc51fc7331408ea"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "97213fa1880be55f9e65379a77f9c3ade2a645216c3d6176ad0ccb484061add3"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "a2f36f5edcce1277ff91dafe373a22b54a953c980469ce73928488437cb13e69"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "9e3d3622f6b6fe94c8673adce6e4d444cad3fa13dec3b40df0878aa05b99bca2"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "fc028baef4a64a74f4a7cd4c660d14d2461a891971fb83a46d9656daaecf4e1a"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "8fca873cb4d4c3767f381d6839838c584c222d2893f96aad46a35217321396db"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "4c9419856c32a6a6667a954d2388b454d49218e510cb4ecd3239ca49fb1a2a69"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "69c1fde28be64b19007ecdc276586b630bf0f5498cb27bf06b78d9b21ce57192"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "743892b7ae5de00ce1dd53b226e272d0fe3cf2bab8772b058ba6631558b65e62"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "9e6d2f6685262b291f79fdba9fe4050fc6dd3f2a4534bc3e3d4b50a0985f83db"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "315acc11c701143c651ee5435b70724cd33cc672c5036739f89e9a47bfad2652"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "ca633d5a182556c28f58d6cf0a75a8d876d7ed2f4bfd5ad4fab3eb435e6ee1c0"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "4023554c82a104bbf91f83665d8b30a87d99b2e0766cc79db97d1ac669774aa6"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "2126e88ce57230ffd398a422a763ee37d8bc178f8d3e6218bb3d10dc1f94da5a"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "c983955ceb615cc543e192e19cc26acfe8d881649af53e189e60c3e0d64bd184"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "55168d27b34a758e38bfe4133eaf3462ea88879866575a15ea7451ce93103905"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "fc7eb7cfc7098d19eb7c3cea351cc311c8a3a0eb4b09e5176300969bda799b33"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "1bb886dfdc12b37ac679e6a797f4fe85d570e57fc38dff863671773e206ba4b5"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- 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
@ -9,8 +9,14 @@
  "attributes": {
    "lastModification": {
      "actor": "external",
+<<<<<<< HEAD
      "timestamp": "2025-04-08T08:59:14Z"
    },
    "lastModificationSignature": "8a7c54b4193d14765edf5b972e0715d42f39710b636c3e5f2dc1532596d2c233"
+=======
+      "timestamp": "2025-04-08T09:28:16Z"
+    },
+    "lastModificationSignature": "7f59f3595a0b0516ebb83eb153cb669633751c7a41802af54d69d01e3a17e5e4"
+>>>>>>> 0a3a29c8946eb9edc487afe8f8a737b1ab5a41c1
  }
 }
--- a/Show More
+++ b/Show More