diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786613438.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786613438.json new file mode 100644 index 00000000..a8b1579e --- /dev/null +++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786613438.json @@ -0,0 +1,10 @@ +{ + "id": "3487a977-1ff7-4ce3-af79-5643f067cea5", + "name": "oev-123", + "auth_method": { + "type": "password", + "password": "ENC:v1:U1RSTQEFa04WgDew4+qMlR3EjHB3fkStgYNu3SXHDhWOZTxe03y8" + }, + "created_at": "2026-08-13T04:15:02.456656+00:00", + "updated_at": "2026-08-13T04:15:02.456656+00:00" +} \ No newline at end of file diff --git a/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786613438.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786613438.json new file mode 100644 index 00000000..29a44ed5 --- /dev/null +++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786613438.json @@ -0,0 +1,13 @@ +{ + "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff", + "name": "oev-private", + "auth_method": { + "type": "private_key", + "private_key": "ENC:v1:U1RSTQGLBbXyusB6RsJHWpmZ1XCBNh8oqm49m41GfXRrofiytfFZORj5zn16wp1TaLB+kKkOFjBiPDhRUqmWg3+lnQavM20x3g8tIcipYnl2Utfac24aVCxQwaJPvxt95U/rZjjg3fGIKpdfywVcC6kKYPiVQcGeaxiDyiz4TGEr2NkdQGvSAsS3cy62Kn2kNfrZE1Y5YSEoGmuFZdj4myqGVD06OWSRrturoH9nIzrSiFKemMKwXY8deTJp4LhXCaVi5kI7ZYO91pcP5KX4w8y2ZS2uNomZvgBos5lkTg22GOnfShiwdVfqeC/TMGuQvpdmEHyZJJjcsj8O+uqC1/5U2YQwEAnYfOzdmTVMTgmYRyufIqUFFRaIsPrBDhMrUrZvW3T04u0eUAaPBgsenMf0SEHk974OJazwxlkHZk1qZPGGRFU5dbaUnMoBFzP8PQphtPhEQI8L3gKqKgoYy1huT0OxpJWfKgZ+Dn0r4lubQfClUr+/BiyPpfVo/qEji4e24jG+d9GWUuxKeLMtO/UpKHVf34IZBfZv/w2W7OCH9Z+wH30S175MrKRlpeyLJIewpwRlW5kX0YlF", + "passphrase": null, + "key_type": null, + "fingerprint": null + }, + "created_at": "2026-08-13T04:11:59.658692+00:00", + "updated_at": "2026-08-13T04:11:59.658692+00:00" +} \ No newline at end of file diff --git a/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786613438.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786613438.json new file mode 100644 index 00000000..7022c81e --- /dev/null +++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786613438.json @@ -0,0 +1,10 @@ +{ + "id": "81915847-1a38-40df-8abf-c80601af2708", + "name": "oev-2025", + "auth_method": { + "type": "password", + "password": "ENC:v1:U1RSTQGo0G+vOUOjqnJahiLcyfY8J4i+M0l/cFSXUWydwf5lSp4Wueo=" + }, + "created_at": "2026-08-13T04:15:22.425983+00:00", + "updated_at": "2026-08-13T04:15:22.425983+00:00" +} \ No newline at end of file