diff --git a/backups/conflicts/cfcc6e2e-666e-4928-9914-dea57e939bf0_conflict_1786684940.json b/backups/conflicts/cfcc6e2e-666e-4928-9914-dea57e939bf0_conflict_1786684940.json new file mode 100644 index 00000000..95885b11 --- /dev/null +++ b/backups/conflicts/cfcc6e2e-666e-4928-9914-dea57e939bf0_conflict_1786684940.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