From 6d363e6c78068827cbdbd635c3ad6aa1e13c2307 Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <andrew.lukoshko@gmail.com>
Date: Thu, 22 Aug 2024 07:36:29 +0000
Subject: [PATCH] import leapp-repository-0.21.0-2.el8

---
 ...alibaba-add-ARM-RHEL8-and-RHEL9-setup-entries-1.patch | 9 ++++++---
 SPECS/leapp-repository.spec                              | 1 -
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/SOURCES/0001-rhui-alibaba-add-ARM-RHEL8-and-RHEL9-setup-entries-1.patch b/SOURCES/0001-rhui-alibaba-add-ARM-RHEL8-and-RHEL9-setup-entries-1.patch
index bbd0ed2..8f87f9a 100644
--- a/SOURCES/0001-rhui-alibaba-add-ARM-RHEL8-and-RHEL9-setup-entries-1.patch
+++ b/SOURCES/0001-rhui-alibaba-add-ARM-RHEL8-and-RHEL9-setup-entries-1.patch
@@ -38,7 +38,10 @@ index 51694ac2..30de0275 100644
 +                      os_version='9'),
      ]
  }
- 
--- 
-2.47.0
 
+--
+<<<<<<< HEAD
+2.47.0
+=======
+2.45.2
+>>>>>>> 60a7d4e (import leapp-repository-0.21.0-2.el8)
diff --git a/SPECS/leapp-repository.spec b/SPECS/leapp-repository.spec
index af2fa3b..9436002 100644
--- a/SPECS/leapp-repository.spec
+++ b/SPECS/leapp-repository.spec
@@ -1173,4 +1173,3 @@ done;
 * Wed Nov 07 2018 Petr Stodulka <pstodulk@redhat.com> - 0.3-1
 - Initial RPM
   Resolves: #1636481
-