From 2285bb6e295e7956d15ad62ee0d58d6dd71c11af Mon Sep 17 00:00:00 2001 From: sTerm Sync Date: Wed, 16 Sep 2026 22:15:32 +0700 Subject: [PATCH] Auto-sync: update local configurations --- ...a-b65d-37eae669b179_conflict_1786781175.json | 17 ----------------- ...conflict_1786781175_conflict_1786781237.json | 17 ----------------- ...conflict_1786781237_conflict_1786781298.json | 17 ----------------- ...conflict_1786781298_conflict_1786781358.json | 17 ----------------- ...conflict_1786781358_conflict_1786781419.json | 17 ----------------- ...conflict_1786781419_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781419_conflict_1786781540.json | 17 ----------------- ...conflict_1786781358_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781358_conflict_1786781540.json | 17 ----------------- ...conflict_1786781298_conflict_1786781419.json | 17 ----------------- ...conflict_1786781419_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781419_conflict_1786781540.json | 17 ----------------- ...conflict_1786781298_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781298_conflict_1786781540.json | 17 ----------------- ...conflict_1786781237_conflict_1786781358.json | 17 ----------------- ...conflict_1786781358_conflict_1786781419.json | 17 ----------------- ...conflict_1786781419_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781419_conflict_1786781540.json | 17 ----------------- ...conflict_1786781358_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781358_conflict_1786781540.json | 17 ----------------- ...conflict_1786781237_conflict_1786781419.json | 17 ----------------- ...conflict_1786781419_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781419_conflict_1786781540.json | 17 ----------------- ...conflict_1786781237_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781237_conflict_1786781540.json | 17 ----------------- ...conflict_1786781175_conflict_1786781298.json | 17 ----------------- ...conflict_1786781298_conflict_1786781358.json | 17 ----------------- ...conflict_1786781358_conflict_1786781419.json | 17 ----------------- ...conflict_1786781419_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781419_conflict_1786781540.json | 17 ----------------- ...conflict_1786781358_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781358_conflict_1786781540.json | 17 ----------------- ...conflict_1786781298_conflict_1786781419.json | 17 ----------------- ...conflict_1786781419_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781419_conflict_1786781540.json | 17 ----------------- ...conflict_1786781298_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781298_conflict_1786781540.json | 17 ----------------- ...conflict_1786781175_conflict_1786781358.json | 17 ----------------- ...conflict_1786781358_conflict_1786781419.json | 17 ----------------- ...conflict_1786781419_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781419_conflict_1786781540.json | 17 ----------------- ...conflict_1786781358_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781358_conflict_1786781540.json | 17 ----------------- ...conflict_1786781175_conflict_1786781419.json | 17 ----------------- ...conflict_1786781419_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781419_conflict_1786781540.json | 17 ----------------- ...conflict_1786781175_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781175_conflict_1786781540.json | 17 ----------------- ...a-b65d-37eae669b179_conflict_1786781237.json | 17 ----------------- ...conflict_1786781237_conflict_1786781298.json | 17 ----------------- ...conflict_1786781298_conflict_1786781358.json | 17 ----------------- ...conflict_1786781358_conflict_1786781419.json | 17 ----------------- ...conflict_1786781419_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781419_conflict_1786781540.json | 17 ----------------- ...conflict_1786781358_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781358_conflict_1786781540.json | 17 ----------------- ...conflict_1786781298_conflict_1786781419.json | 17 ----------------- ...conflict_1786781419_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781419_conflict_1786781540.json | 17 ----------------- ...conflict_1786781298_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781298_conflict_1786781540.json | 17 ----------------- ...conflict_1786781237_conflict_1786781358.json | 17 ----------------- ...conflict_1786781358_conflict_1786781419.json | 17 ----------------- ...conflict_1786781419_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781419_conflict_1786781540.json | 17 ----------------- ...conflict_1786781358_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781358_conflict_1786781540.json | 17 ----------------- ...conflict_1786781237_conflict_1786781419.json | 17 ----------------- ...conflict_1786781419_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781419_conflict_1786781540.json | 17 ----------------- ...conflict_1786781237_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781237_conflict_1786781540.json | 17 ----------------- ...a-b65d-37eae669b179_conflict_1786781298.json | 17 ----------------- ...conflict_1786781298_conflict_1786781358.json | 17 ----------------- ...conflict_1786781358_conflict_1786781419.json | 17 ----------------- ...conflict_1786781419_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781419_conflict_1786781540.json | 17 ----------------- ...conflict_1786781358_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781358_conflict_1786781540.json | 17 ----------------- ...conflict_1786781298_conflict_1786781419.json | 17 ----------------- ...conflict_1786781419_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781419_conflict_1786781540.json | 17 ----------------- ...conflict_1786781298_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781298_conflict_1786781540.json | 17 ----------------- ...a-b65d-37eae669b179_conflict_1786781358.json | 17 ----------------- ...conflict_1786781358_conflict_1786781419.json | 17 ----------------- ...conflict_1786781419_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781419_conflict_1786781540.json | 17 ----------------- ...conflict_1786781358_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781358_conflict_1786781540.json | 17 ----------------- ...a-b65d-37eae669b179_conflict_1786781419.json | 17 ----------------- ...conflict_1786781419_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...conflict_1786781419_conflict_1786781540.json | 17 ----------------- ...a-b65d-37eae669b179_conflict_1786781480.json | 17 ----------------- ...conflict_1786781480_conflict_1786781540.json | 17 ----------------- ...a-b65d-37eae669b179_conflict_1786781540.json | 17 ----------------- ...a-b65d-37eae669b179_conflict_1786781601.json | 17 ----------------- ...a-b65d-37eae669b179_conflict_1786781662.json | 17 ----------------- ...a-b65d-37eae669b179_conflict_1786781722.json | 17 ----------------- ...a-b65d-37eae669b179_conflict_1786781783.json | 17 ----------------- ...a-b65d-37eae669b179_conflict_1786781843.json | 17 ----------------- ...a-b65d-37eae669b179_conflict_1786781904.json | 17 ----------------- ...a-b65d-37eae669b179_conflict_1786781964.json | 17 ----------------- ...a-b65d-37eae669b179_conflict_1786782025.json | 17 ----------------- ...a-b65d-37eae669b179_conflict_1786782085.json | 17 ----------------- ...a-b65d-37eae669b179_conflict_1786782146.json | 17 ----------------- ...a-b65d-37eae669b179_conflict_1786782206.json | 17 ----------------- ...a-b65d-37eae669b179_conflict_1786782267.json | 17 ----------------- ...a-b65d-37eae669b179_conflict_1786782328.json | 17 ----------------- 140 files changed, 2380 deletions(-) delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781419.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781419_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781419_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781419_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781419.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781419_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781419_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781419.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781419_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781419_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781419_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781419.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781419.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781419_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781419_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781419_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781419.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781419_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781419_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781419.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781419_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781419_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781419_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781419.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781419_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781419_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781419_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781419.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781419_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781419_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781419.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781419_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781419_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781419_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781419.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781419.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781419_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781419_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781419_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781419.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781419_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781419_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781419.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781419_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781419_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781419_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781480.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781480_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781540.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781601.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781662.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781722.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781783.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781843.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781904.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781964.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786782025.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786782085.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786782146.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786782206.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786782267.json delete mode 100644 backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786782328.json diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781419.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781419.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781419.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781419_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781419_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781419_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781419_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781419_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781419_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781419_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781419_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781419_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781298_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781419.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781419.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781419.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781419_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781419_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781419_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781419_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781419_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781419_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781358_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781419.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781419.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781419.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781419_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781419_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781419_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781419_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781419_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781419_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781419_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781419_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781419_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781237_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781419.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781419.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781419.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781358_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781419.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781419.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781419.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781419_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781419_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781419_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781419_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781419_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781419_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781419_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781419_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781419_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781298_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781419.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781419.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781419.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781419_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781419_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781419_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781419_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781419_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781419_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781358_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781419.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781419.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781419.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781419_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781419_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781419_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781419_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781419_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781419_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781419_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781419_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781419_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781175_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781358_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781419.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781419.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781419.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781419_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781419_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781419_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781419_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781419_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781419_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781419_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781419_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781419_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781298_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781419.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781419.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781419.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781419_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781419_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781419_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781419_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781419_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781419_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781358_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781419.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781419.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781419.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781419_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781419_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781419_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781419_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781419_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781419_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781419_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781419_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781419_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781237_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781419.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781419.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781419.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781419_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781358_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781419.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781419.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781419.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781419_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781419_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781419_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781419_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781419_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781419_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781419_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781419_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781419_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781298_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781419.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781419.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781419.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781419_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781419_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781419_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781419_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781419_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781419_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781419_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781358_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781419.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781419.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781419.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781419_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781419_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781419_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781419_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781419_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781419_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781419_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781419_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781419_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781480.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781480.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781480.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781480_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781480_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781480_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781540.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781540.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781540.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781601.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781601.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781601.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781662.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781662.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781662.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781722.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781722.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781722.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781783.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781783.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781783.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781843.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781843.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781843.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781904.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781904.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781904.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781964.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781964.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786781964.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786782025.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786782025.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786782025.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786782085.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786782085.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786782085.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786782146.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786782146.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786782146.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786782206.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786782206.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786782206.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786782267.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786782267.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786782267.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file diff --git a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786782328.json b/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786782328.json deleted file mode 100644 index 3b573c56..00000000 --- a/backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1786782328.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "a57833f9-8e37-412a-b65d-37eae669b179", - "name": "Docker Password Host", - "hostname": "127.0.0.1", - "port": 2222, - "username": "testuser", - "identity_id": null, - "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:25:31.917244+00:00", - "updated_at": "2026-08-14T05:25:31.917244+00:00" -} \ No newline at end of file