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

---
 ...-4ce3-af79-5643f067cea5_conflict_1786614654.json | 10 ++++++++++
 ...-4525-bff3-e09a7a2ffbff_conflict_1786614654.json | 13 +++++++++++++
 ...-40df-8abf-c80601af2708_conflict_1786614654.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_1786614654.json
 create mode 100644 backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786614654.json
 create mode 100644 backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786614654.json

diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786614654.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786614654.json
new file mode 100644
index 00000000..78421839
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786614654.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHe3kdLPOJCeOAxUN4rmW6hq1NzLkhgIxKef26n8aCo33pb"
+  },
+  "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_1786614654.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786614654.json
new file mode 100644
index 00000000..6bc3382b
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786614654.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQFd9AC0bLowWpJfi1oT5MKZ2kBaRPfp0tR/wGY4Xp9njKtTfrXNe/zwO8NP3qTtZ6RMFmjdNZjxSndh5GRbVUicQKxqZ7d7zsmp7SUYCgltQw+qKptSYShCZym/qxZKREK5bFzTQcHX+QRphHJxwOHQfUxDE5+DKnZZ2gMLeMjlshKWUiPOW3PUKATbooaQa2ZhTGjOLGlOXVFxCp3D5NvGLNKGz496XgBfn9VVk3DgAfPhV9uBcb3zjBEN34d5oC8PscJM/lv+jSM9wMo56qYCMaz6E5o+m9hgQYXGXu0EMJr5c64NvPiBAnldnFrBvMsxNMzm8/XHR9wf3fgiA7pBpDcunKISpQPZTY8yUttUZAerpVjtvRXW+xLusYSWBzgUiaqVXBArGF09BVDZYwrhRE3t2ifh8l864I44Ua0RLDUE6NxZQmbzK0dDjGyjrkuOn8Dh6DFBizdd2jIuzo6BM2sLD1fq9In05SP9zyCNXlhR8A+wta/EdOCS4eBgvdt8xHspT1X8YYXHrXvNc8aYG0LuzwIcce2DA8QXaUD0BDOKhdquMCUv116Q7ZULHh1yPGbuJmXj",
+    "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_1786614654.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786614654.json
new file mode 100644
index 00000000..81cff5c5
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786614654.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQG/eCvELRfEBMaui39iaRUUz2LGWTwqjnRUFLRP3nvI4BCsXDo="
+  },
+  "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 78421839..ab1f367e 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:U1RSTQHe3kdLPOJCeOAxUN4rmW6hq1NzLkhgIxKef26n8aCo33pb"
+    "password": "ENC:v1:U1RSTQEcDB0Ull69SrUG+HiP8KRCOtnATZRaO5nEDlg0/228YA7m"
   },
   "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 6bc3382b..2d7953be 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:U1RSTQFd9AC0bLowWpJfi1oT5MKZ2kBaRPfp0tR/wGY4Xp9njKtTfrXNe/zwO8NP3qTtZ6RMFmjdNZjxSndh5GRbVUicQKxqZ7d7zsmp7SUYCgltQw+qKptSYShCZym/qxZKREK5bFzTQcHX+QRphHJxwOHQfUxDE5+DKnZZ2gMLeMjlshKWUiPOW3PUKATbooaQa2ZhTGjOLGlOXVFxCp3D5NvGLNKGz496XgBfn9VVk3DgAfPhV9uBcb3zjBEN34d5oC8PscJM/lv+jSM9wMo56qYCMaz6E5o+m9hgQYXGXu0EMJr5c64NvPiBAnldnFrBvMsxNMzm8/XHR9wf3fgiA7pBpDcunKISpQPZTY8yUttUZAerpVjtvRXW+xLusYSWBzgUiaqVXBArGF09BVDZYwrhRE3t2ifh8l864I44Ua0RLDUE6NxZQmbzK0dDjGyjrkuOn8Dh6DFBizdd2jIuzo6BM2sLD1fq9In05SP9zyCNXlhR8A+wta/EdOCS4eBgvdt8xHspT1X8YYXHrXvNc8aYG0LuzwIcce2DA8QXaUD0BDOKhdquMCUv116Q7ZULHh1yPGbuJmXj",
+    "private_key": "ENC:v1:U1RSTQEDKF9nb5Kt3oaQfS9BRzLBb+xfpoz14+aGH89ErbJtog6iGpP0ovFXesixeFSlT8ft5FxCJPfta2btD7zv7zE4vTLFwAQxW4WP1J2184KSObsceYKCxWUq3megOvVb4gxBnT2iMVngnq1+sZg7lbEx16238Fy3AMF/Ui9vky1MX2kBVcte2frQfgCxbBYd6588AwwZS/dfA7kqLXzXSAlXANAv1JUK85PCJTTOfcoKZI+lharIVLqqj3NpIsVXL2g9BYjrrBXKv8ImNsSUwHRgrK6LElCZBTYM6r4bCAJznooPZIpcxbH6kwU2qnTh9V7JVTrQRI7xWXtTprAg0EvyJkYtB94fja7WT/2bRTcyuknvzTvv8+dtVBvNQZ75JLFvxFrV+k+NwDTufElTQ2awkraFz8VCWcgYwQh050NOA2aLVADisYdz6y7e7a8oPVibkR6GSygy5vlgJtH1CY5v8QvIKWPIi/n6KNnOjUOW43IKj/LNrk1lnu4oL3YP1zVgYBIjR1u51MexB1cyJpmK6jjLSvqetvx2d1+8GyTLlTAw2bSEU3FbwMLAZCOocbJNaSo2vS4S",
     "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 81cff5c5..974da9af 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:U1RSTQG/eCvELRfEBMaui39iaRUUz2LGWTwqjnRUFLRP3nvI4BCsXDo="
+    "password": "ENC:v1:U1RSTQFKNihih8IvyTU38VSgVQ4wLTAKyhgBnDBcUM0aSraTnDSyvnY="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"