From fe6e7461e2d3a794bb956bb712ed6ef68208d4d2 Mon Sep 17 00:00:00 2001
From: Adam Piasecki <c4rt0gr4ph3r@gmail.com>
Date: Mon, 9 Oct 2023 15:27:03 +0100
Subject: [PATCH] Update manifest-lock.overrides.yaml

Co-authored-by: Dusty Mabe <dusty@dustymabe.com>
---
 manifest-lock.overrides.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/manifest-lock.overrides.yaml b/manifest-lock.overrides.yaml
index a3d58dc847..5a2cdd12fc 100644
--- a/manifest-lock.overrides.yaml
+++ b/manifest-lock.overrides.yaml
@@ -9,7 +9,6 @@
 # for FCOS-specific packages (ignition, afterburn, etc.).
 
 packages:
-<<<<<<< HEAD
   coreos-installer:
     evr: 0.18.0-1.fc38
     metadata: