Auto-sync: update local configurations

backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686221.json

@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQGbEtoVS4YrxC3NbBmhxe7RgPCPxj04coa2e80Qhi8cNeNHT4EnFr8="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}

backups/conflicts/cfcc6e2e-666e-4928-9914-dea57e939bf0_conflict_1786686221.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"
+}

hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json~FETCH_HEAD

@@ -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"
+}

hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json~HEAD

@@ -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"
+}

identities/a7ca3944-af0e-498b-abd1-6af456468102.json

@@ -3,7 +3,7 @@
   "name": "Docker Test Identity",
   "auth_method": {
     "type": "password",
-    "password": "ENC:v1:U1RSTQGbEtoVS4YrxC3NbBmhxe7RgPCPxj04coa2e80Qhi8cNeNHT4EnFr8="
+    "password": "ENC:v1:U1RSTQFYh2qbbKg6KjtJucQD5L+L4Vn1l5jSHwTsShybOOihJth9xfHmwDQ="
   },
   "created_at": "2026-08-14T05:20:24.759864+00:00",
   "updated_at": "2026-08-14T05:20:24.759864+00:00"

identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json~FETCH_HEAD

@@ -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:U1RSTQGbEtoVS4YrxC3NbBmhxe7RgPCPxj04coa2e80Qhi8cNeNHT4EnFr8="
+=======
+    "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"
+}

identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json~HEAD

@@ -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:U1RSTQEnAAYX3oN1vj9anMLGWj1rPmmD2wmr2Db28aXArkz9etjrIb3HcJ4="
+=======
+    "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"
+}