From 63239df8d670bd59cd52215bea9276d1444232d4 Mon Sep 17 00:00:00 2001
From: sTerm Sync <sync@sterm.local>
Date: Fri, 14 Aug 2026 12:46:42 +0700
Subject: [PATCH] Auto-sync: update local configurations

---
 ...b-abd1-6af456468102_conflict_1786686342.json | 10 ++++++++++
 ...8-9914-dea57e939bf0_conflict_1786686342.json | 17 +++++++++++++++++
 ...3-acdf-9cdce6b4f1c0_conflict_1786686342.json |  0
 ...c-ac2a-43782ef99f02_conflict_1786686342.json |  0
 ...ae5-43fc-ac2a-43782ef99f02.json~FETCH_HEAD_0 | 17 +++++++++++++++++
 ...69c2-5ae5-43fc-ac2a-43782ef99f02.json~HEAD_0 | 17 +++++++++++++++++
 .../a7ca3944-af0e-498b-abd1-6af456468102.json   |  2 +-
 ...145-46f3-acdf-9cdce6b4f1c0.json~FETCH_HEAD_0 | 14 ++++++++++++++
 ...2263-9145-46f3-acdf-9cdce6b4f1c0.json~HEAD_0 | 14 ++++++++++++++
 9 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686342.json
 create mode 100644 backups/conflicts/cfcc6e2e-666e-4928-9914-dea57e939bf0_conflict_1786686342.json
 rename identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json => backups/conflicts/d3182263-9145-46f3-acdf-9cdce6b4f1c0_conflict_1786686342.json (100%)
 rename hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json => backups/conflicts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02_conflict_1786686342.json (100%)
 create mode 100644 hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json~FETCH_HEAD_0
 create mode 100644 hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json~HEAD_0
 create mode 100644 identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json~FETCH_HEAD_0
 create mode 100644 identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json~HEAD_0

diff --git a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686342.json b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686342.json
new file mode 100644
index 00000000..0cbfb135
--- /dev/null
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686342.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQGG9cTdRVEap10v0ckR63uN5s0iO79DvYjH5UGDPeqTDWfBqN96+1o="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
\ No newline at end of file
diff --git a/backups/conflicts/cfcc6e2e-666e-4928-9914-dea57e939bf0_conflict_1786686342.json b/backups/conflicts/cfcc6e2e-666e-4928-9914-dea57e939bf0_conflict_1786686342.json
new file mode 100644
index 00000000..95885b11
--- /dev/null
+++ b/backups/conflicts/cfcc6e2e-666e-4928-9914-dea57e939bf0_conflict_1786686342.json
@@ -0,0 +1,17 @@
+{
+  "id": "cfcc6e2e-666e-4928-9914-dea57e939bf0",
+  "name": "Docker Password Host",
+  "hostname": "127.0.0.1",
+  "port": 2222,
+  "username": "testuser",
+  "identity_id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "group_id": null,
+  "tags": [],
+  "jump_host_id": null,
+  "keepalive_interval": 1,
+  "legacy_algorithms": null,
+  "ssh_config_overrides": null,
+  "notes": null,
+  "created_at": "2026-08-14T05:20:24.764057+00:00",
+  "updated_at": "2026-08-14T05:20:24.764057+00:00"
+}
\ No newline at end of file
diff --git a/identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json b/backups/conflicts/d3182263-9145-46f3-acdf-9cdce6b4f1c0_conflict_1786686342.json
similarity index 100%
rename from identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json
rename to backups/conflicts/d3182263-9145-46f3-acdf-9cdce6b4f1c0_conflict_1786686342.json
diff --git a/hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json b/backups/conflicts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02_conflict_1786686342.json
similarity index 100%
rename from hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json
rename to backups/conflicts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02_conflict_1786686342.json
diff --git a/hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json~FETCH_HEAD_0 b/hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json~FETCH_HEAD_0
new file mode 100644
index 00000000..19128175
--- /dev/null
+++ b/hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json~FETCH_HEAD_0
@@ -0,0 +1,17 @@
+{
+  "id": "ed0769c2-5ae5-43fc-ac2a-43782ef99f02",
+  "name": "Docker Password Host",
+  "hostname": "127.0.0.1",
+  "port": 2222,
+  "username": "testuser",
+  "identity_id": "d3182263-9145-46f3-acdf-9cdce6b4f1c0",
+  "group_id": null,
+  "tags": [],
+  "jump_host_id": null,
+  "keepalive_interval": 1,
+  "legacy_algorithms": null,
+  "ssh_config_overrides": null,
+  "notes": null,
+  "created_at": "2026-08-14T05:42:03.155846+00:00",
+  "updated_at": "2026-08-14T05:42:03.155846+00:00"
+}
\ No newline at end of file
diff --git a/hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json~HEAD_0 b/hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json~HEAD_0
new file mode 100644
index 00000000..19128175
--- /dev/null
+++ b/hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json~HEAD_0
@@ -0,0 +1,17 @@
+{
+  "id": "ed0769c2-5ae5-43fc-ac2a-43782ef99f02",
+  "name": "Docker Password Host",
+  "hostname": "127.0.0.1",
+  "port": 2222,
+  "username": "testuser",
+  "identity_id": "d3182263-9145-46f3-acdf-9cdce6b4f1c0",
+  "group_id": null,
+  "tags": [],
+  "jump_host_id": null,
+  "keepalive_interval": 1,
+  "legacy_algorithms": null,
+  "ssh_config_overrides": null,
+  "notes": null,
+  "created_at": "2026-08-14T05:42:03.155846+00:00",
+  "updated_at": "2026-08-14T05:42:03.155846+00:00"
+}
\ No newline at end of file
diff --git a/identities/a7ca3944-af0e-498b-abd1-6af456468102.json b/identities/a7ca3944-af0e-498b-abd1-6af456468102.json
index 0cbfb135..6aee218d 100644
--- a/identities/a7ca3944-af0e-498b-abd1-6af456468102.json
+++ b/identities/a7ca3944-af0e-498b-abd1-6af456468102.json
@@ -3,7 +3,7 @@
   "name": "Docker Test Identity",
   "auth_method": {
     "type": "password",
-    "password": "ENC:v1:U1RSTQGG9cTdRVEap10v0ckR63uN5s0iO79DvYjH5UGDPeqTDWfBqN96+1o="
+    "password": "ENC:v1:U1RSTQGkBLimjyZO3SISWOquBk+MyhMd3qLN8/Vn6H+Yj3x5hHJ2IXFMsOs="
   },
   "created_at": "2026-08-14T05:20:24.759864+00:00",
   "updated_at": "2026-08-14T05:20:24.759864+00:00"
diff --git a/identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json~FETCH_HEAD_0 b/identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json~FETCH_HEAD_0
new file mode 100644
index 00000000..c941e572
--- /dev/null
+++ b/identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json~FETCH_HEAD_0
@@ -0,0 +1,14 @@
+{
+  "id": "d3182263-9145-46f3-acdf-9cdce6b4f1c0",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
+    "password": "ENC:v1:U1RSTQGG9cTdRVEap10v0ckR63uN5s0iO79DvYjH5UGDPeqTDWfBqN96+1o="
+=======
+    "password": "ENC:v1:U1RSTQFq5AK14rRkdKl/YEe82y5Z8oE8Qej6oLP7b68oPUEDISRbGZLJ9zY="
+>>>>>>> FETCH_HEAD:identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json
+  },
+  "created_at": "2026-08-14T05:42:03.153822+00:00",
+  "updated_at": "2026-08-14T05:42:03.153822+00:00"
+}
\ No newline at end of file
diff --git a/identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json~HEAD_0 b/identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json~HEAD_0
new file mode 100644
index 00000000..306efc6f
--- /dev/null
+++ b/identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json~HEAD_0
@@ -0,0 +1,14 @@
+{
+  "id": "d3182263-9145-46f3-acdf-9cdce6b4f1c0",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
+    "password": "ENC:v1:U1RSTQFYh2qbbKg6KjtJucQD5L+L4Vn1l5jSHwTsShybOOihJth9xfHmwDQ="
+=======
+    "password": "ENC:v1:U1RSTQFq5AK14rRkdKl/YEe82y5Z8oE8Qej6oLP7b68oPUEDISRbGZLJ9zY="
+>>>>>>> FETCH_HEAD:identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json
+  },
+  "created_at": "2026-08-14T05:42:03.153822+00:00",
+  "updated_at": "2026-08-14T05:42:03.153822+00:00"
+}
\ No newline at end of file