From 9986dfc3f36514023b1b0b339603c7d2e068ab5e Mon Sep 17 00:00:00 2001 From: Jake Hutchinson Date: Tue, 21 Jan 2025 14:23:25 +0000 Subject: [PATCH] Fix bad merge conflict --- etc/kayobe/pulp-repo-versions.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index 90186ec3e..b9a27f494 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -46,9 +46,9 @@ stackhpc_pulp_repo_rocky_9_5_crb_version: 20241217T005008 stackhpc_pulp_repo_rocky_9_5_extras_version: 20241216T004230 stackhpc_pulp_repo_rocky_9_5_highavailability_version: 20241202T003154 stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20241127T003858 -stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20240911T041957 -stackhpc_pulp_repo_ubuntu_jammy_security_version: 20240924T064114 -stackhpc_pulp_repo_ubuntu_jammy_version: 20240924T064114 +stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20241217T045049 +stackhpc_pulp_repo_ubuntu_jammy_security_version: 20241217T071258 +stackhpc_pulp_repo_ubuntu_jammy_version: 20241217T071258 stackhpc_pulp_repo_rhel_9_4_doca_version: 20241211T153620 stackhpc_pulp_repo_rhel_9_4_doca_modules_version: 20241213T112245 stackhpc_pulp_repo_rhel_9_5_doca_version: 20241211T171301