sonpx/sterm-profile2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Auto-sync: update local configurations

Browse Source
This commit is contained in:
sTerm Sync
2026-08-14 12:48:43 +07:00
parent 0e0429b3ac
commit 32fd9bc9e1
9 changed files with 90 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686463.json Normal file
View File

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

17
backups/conflicts/cfcc6e2e-666e-4928-9914-dea57e939bf0_conflict_1786686463.json Normal file
View File

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

14
backups/conflicts/d3182263-9145-46f3-acdf-9cdce6b4f1c0_conflict_1786686463.json Normal file
View File

@@ -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:U1RSTQGkBLimjyZO3SISWOquBk+MyhMd3qLN8/Vn6H+Yj3x5hHJ2IXFMsOs="
=======
"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"
}

17
backups/conflicts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02_conflict_1786686463.json Normal file
View File

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