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 97f7900..06b34e3 100644 Binary files a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM Button/thumbnail.png and b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM Button/thumbnail.png differ 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 9b2abb4..a2432e4 100644 Binary files a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM03 Non Con/thumbnail.png and b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM03 Non Con/thumbnail.png differ 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