From 4bde4a56ec0a54e3681c456121ddaecb5d562d89 Mon Sep 17 00:00:00 2001
From: sTerm Sync <sync@sterm.local>
Date: Thu, 13 Aug 2026 16:23:29 +0700
Subject: [PATCH] Auto-sync: update local configurations

---
 ...-4ce3-af79-5643f067cea5_conflict_1786612949.json | 10 ++++++++++
 ...-4525-bff3-e09a7a2ffbff_conflict_1786612949.json | 13 +++++++++++++
 ...-40df-8abf-c80601af2708_conflict_1786612949.json | 10 ++++++++++
 .../3487a977-1ff7-4ce3-af79-5643f067cea5.json       |  2 +-
 .../7db2f101-b275-4525-bff3-e09a7a2ffbff.json       |  2 +-
 .../81915847-1a38-40df-8abf-c80601af2708.json       |  2 +-
 6 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786612949.json
 create mode 100644 backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786612949.json
 create mode 100644 backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786612949.json

diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786612949.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786612949.json
new file mode 100644
index 00000000..debd7207
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786612949.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHud8P6jUB7TIv1ifZ/WtV1/3gtFYWoy2gVdCfnF++G881n"
+  },
+  "created_at": "2026-08-13T04:15:02.456656+00:00",
+  "updated_at": "2026-08-13T04:15:02.456656+00:00"
+}
\ No newline at end of file
diff --git a/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786612949.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786612949.json
new file mode 100644
index 00000000..89a6e772
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786612949.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQHPOsrLG2EsfCiyMoVIyvNuB3+d54ZptLHqs0iQ5PXWBtADYxIEshnuhWnvI2x4YFNnKfaUiP2WAxbrp7mR06fGcHJfHLGQnyle/B0UsV6sAHmo9nBViKCh4omYSMzythco4Kg64tLOMjSn8bVX0keUKNBsiZkUwHvtw+ut/eoZH3B+wU4qJnjF/otRJ47nTHEJiakrEYr/bunzOY/Otb7P4wBcilwPjh91bxvKSGWXOfZLojkxiuT/xRHdTnRu0mG+0knxjgmIEWM5ymqwiQ6ZEcOnlmtMwAHEtyClNgwElsrhiN+nJRwNcKXcOgq8WImevVwvpn+iVFM4ivYC/6XABHX+ZBI2t9I4TusgI4B9eKaMv3olg3nerRxxz0v7nRr+YCsJUYB19BeHty5mqfgTrM4+8Rr9xHDtT7lF1VrdkHt3Y7DTQbQfpQpz9WWXdXtOUfwb9Y46VFteBQ+fffswlmgIoU9QOWD+3wi5hTW61BQJX6T4/GLTviYitwZR52NbQXy8x4PInJ9JUnMbsL83cpnL0RCPZidS5ELmJOWYCvFI6hoibgwSFvCbAPS1C4qpTS8TiapN",
+    "passphrase": null,
+    "key_type": null,
+    "fingerprint": null
+  },
+  "created_at": "2026-08-13T04:11:59.658692+00:00",
+  "updated_at": "2026-08-13T04:11:59.658692+00:00"
+}
\ No newline at end of file
diff --git a/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786612949.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786612949.json
new file mode 100644
index 00000000..d99cb5cb
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786612949.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQG7m6wF//PKlZV8br6jeZh2RIXY7CWGSAUjaTYH7JhX2EchxQA="
+  },
+  "created_at": "2026-08-13T04:15:22.425983+00:00",
+  "updated_at": "2026-08-13T04:15:22.425983+00:00"
+}
\ No newline at end of file
diff --git a/identities/3487a977-1ff7-4ce3-af79-5643f067cea5.json b/identities/3487a977-1ff7-4ce3-af79-5643f067cea5.json
index debd7207..c30640fe 100644
--- a/identities/3487a977-1ff7-4ce3-af79-5643f067cea5.json
+++ b/identities/3487a977-1ff7-4ce3-af79-5643f067cea5.json
@@ -3,7 +3,7 @@
   "name": "oev-123",
   "auth_method": {
     "type": "password",
-    "password": "ENC:v1:U1RSTQHud8P6jUB7TIv1ifZ/WtV1/3gtFYWoy2gVdCfnF++G881n"
+    "password": "ENC:v1:U1RSTQFxO3oucdPPm9UnEuOnit/nvouEn+m78NFyS4MWI7ltZAoG"
   },
   "created_at": "2026-08-13T04:15:02.456656+00:00",
   "updated_at": "2026-08-13T04:15:02.456656+00:00"
diff --git a/identities/7db2f101-b275-4525-bff3-e09a7a2ffbff.json b/identities/7db2f101-b275-4525-bff3-e09a7a2ffbff.json
index 89a6e772..46b50a56 100644
--- a/identities/7db2f101-b275-4525-bff3-e09a7a2ffbff.json
+++ b/identities/7db2f101-b275-4525-bff3-e09a7a2ffbff.json
@@ -3,7 +3,7 @@
   "name": "oev-private",
   "auth_method": {
     "type": "private_key",
-    "private_key": "ENC:v1:U1RSTQHPOsrLG2EsfCiyMoVIyvNuB3+d54ZptLHqs0iQ5PXWBtADYxIEshnuhWnvI2x4YFNnKfaUiP2WAxbrp7mR06fGcHJfHLGQnyle/B0UsV6sAHmo9nBViKCh4omYSMzythco4Kg64tLOMjSn8bVX0keUKNBsiZkUwHvtw+ut/eoZH3B+wU4qJnjF/otRJ47nTHEJiakrEYr/bunzOY/Otb7P4wBcilwPjh91bxvKSGWXOfZLojkxiuT/xRHdTnRu0mG+0knxjgmIEWM5ymqwiQ6ZEcOnlmtMwAHEtyClNgwElsrhiN+nJRwNcKXcOgq8WImevVwvpn+iVFM4ivYC/6XABHX+ZBI2t9I4TusgI4B9eKaMv3olg3nerRxxz0v7nRr+YCsJUYB19BeHty5mqfgTrM4+8Rr9xHDtT7lF1VrdkHt3Y7DTQbQfpQpz9WWXdXtOUfwb9Y46VFteBQ+fffswlmgIoU9QOWD+3wi5hTW61BQJX6T4/GLTviYitwZR52NbQXy8x4PInJ9JUnMbsL83cpnL0RCPZidS5ELmJOWYCvFI6hoibgwSFvCbAPS1C4qpTS8TiapN",
+    "private_key": "ENC:v1:U1RSTQHsFTwyIFf240oAunhZEbSeIwNPbUC4bJ/KO6hPeFKyICnJqI/Ou2yfm18phN0P0N1++DqTKks8BWjwoU6UF6f4bew1S0sqrL0xEYaUGJkquQ5PjvrZ8drqETOu1MWCu5qXkpBUvCU8JHAg8DXVqzfWSALM0zcxgQL7sKRrbHYB2jFtDQmy0ggDV+3jAx5P6mCRozUZ6XKb1Jv+1HVqeNd0/wwxUamBUMbogJSVscL6jI49HPgoEOVREBBMbuX56KeCkrYDA+3tO3xwCeGu7l7SzBlH1CSB/nrJuoXpkRS7EcoV1V8rdcUMcnivEMJV56y4+0/x09q2Azn6OMPLvz2g+qPL4OdkHpNu6uARjHhTr06wQcj3jMSTWXYEqZ5F+2+IoQR9pa57bhN04JNVZVF9fXIcK9zE84wvjnE71ASY7d1UPiMVug+uX+9vpFVZRq00cnTiD5uJEEZEFbdxuOn6kC91Sp99Da4z81zHNYdpjR6aHN/HWUeciv2d8esXIzmSrH9NxKx5UUCkBt92AOxEaIs1knqXsYJynp3ETczw82TlInXChyAMbDkdYHJAVrdCxTxpZxo+",
     "passphrase": null,
     "key_type": null,
     "fingerprint": null
diff --git a/identities/81915847-1a38-40df-8abf-c80601af2708.json b/identities/81915847-1a38-40df-8abf-c80601af2708.json
index d99cb5cb..01c966fe 100644
--- a/identities/81915847-1a38-40df-8abf-c80601af2708.json
+++ b/identities/81915847-1a38-40df-8abf-c80601af2708.json
@@ -3,7 +3,7 @@
   "name": "oev-2025",
   "auth_method": {
     "type": "password",
-    "password": "ENC:v1:U1RSTQG7m6wF//PKlZV8br6jeZh2RIXY7CWGSAUjaTYH7JhX2EchxQA="
+    "password": "ENC:v1:U1RSTQG6j4aCgWkRL10ksL4ZLu6pUB0g9QGokKFdYNafmU2I5XLJufs="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"