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

---
 ...b-abd1-6af456468102_conflict_1786686706.json | 10 ++++++++++
 ...8-9914-dea57e939bf0_conflict_1786686706.json | 17 +++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686706.json
 create mode 100644 backups/conflicts/cfcc6e2e-666e-4928-9914-dea57e939bf0_conflict_1786686706.json

diff --git a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686706.json b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686706.json
new file mode 100644
index 00000000..701d9611
--- /dev/null
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686706.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
+  },
+  "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_1786686706.json b/backups/conflicts/cfcc6e2e-666e-4928-9914-dea57e939bf0_conflict_1786686706.json
new file mode 100644
index 00000000..95885b11
--- /dev/null
+++ b/backups/conflicts/cfcc6e2e-666e-4928-9914-dea57e939bf0_conflict_1786686706.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