import leapp-repository-0.21.0-2.el8

2024-08-22 07:36:29 +00:00 · 2024-08-22 07:36:29 +00:00 · 6d363e6c78
commit 6d363e6c78
parent ef02e9e53b
2 changed files with 6 additions and 4 deletions
--- 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)
--- 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
-