From fc7470c0c87787bedaa3cb3ef9d45ac2ffb90c56 Mon Sep 17 00:00:00 2001 From: MateuszMalisz Date: Wed, 1 Sep 2021 14:09:43 -0700 Subject: [PATCH] Remove glyphs from the merge --- SPECS-SIGNED/kernel-signed/kernel-signed.spec | 7 ------- cgmanifest.json | 20 ------------------- 2 files changed, 27 deletions(-) diff --git a/SPECS-SIGNED/kernel-signed/kernel-signed.spec b/SPECS-SIGNED/kernel-signed/kernel-signed.spec index 67dd2ec067a..a271f972dc8 100644 --- a/SPECS-SIGNED/kernel-signed/kernel-signed.spec +++ b/SPECS-SIGNED/kernel-signed/kernel-signed.spec @@ -9,11 +9,7 @@ %define uname_r %{version}-%{release} Summary: Signed Linux Kernel for %{buildarch} systems Name: kernel-signed-%{buildarch} -<<<<<<< HEAD -Version: 5.10.57.1 -======= Version: 5.10.60.1 ->>>>>>> 1.0-dev Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -150,12 +146,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %endif %changelog -<<<<<<< HEAD -======= * Mon Aug 23 2021 Rachel Menge - 5.10.60.1-1 - Update source to 5.10.60.1 ->>>>>>> 1.0-dev * Thu Aug 12 2021 Rachel Menge - 5.10.57.1-1 - Update source to 5.10.57.1 diff --git a/cgmanifest.json b/cgmanifest.json index 54a60c6bb68..edbbc038fc5 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -2035,13 +2035,8 @@ "type": "other", "other": { "name": "hyperv-daemons", -<<<<<<< HEAD - "version": "5.10.57.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.57.1.tar.gz" -======= "version": "5.10.60.1", "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.60.1.tar.gz" ->>>>>>> 1.0-dev } } }, @@ -2370,13 +2365,8 @@ "type": "other", "other": { "name": "kernel", -<<<<<<< HEAD - "version": "5.10.57.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.57.1.tar.gz" -======= "version": "5.10.60.1", "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.60.1.tar.gz" ->>>>>>> 1.0-dev } } }, @@ -2385,13 +2375,8 @@ "type": "other", "other": { "name": "kernel-headers", -<<<<<<< HEAD - "version": "5.10.57.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.57.1.tar.gz" -======= "version": "5.10.60.1", "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.60.1.tar.gz" ->>>>>>> 1.0-dev } } }, @@ -2400,13 +2385,8 @@ "type": "other", "other": { "name": "kernel-hyperv", -<<<<<<< HEAD - "version": "5.10.57.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.57.1.tar.gz" -======= "version": "5.10.60.1", "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.60.1.tar.gz" ->>>>>>> 1.0-dev } } },