remove change markers from pkggen_core_aarch64.txt

microsoft · Jun 27, 2021 · b04b83d · b04b83d
1 parent ccfd8c5
commit b04b83d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt
@@ -1,9 +1,5 @@
 filesystem-1.1-7.cm1.aarch64.rpm
-<<<<<<< HEAD
-kernel-headers-5.10.42.1-1.cm1.noarch.rpm
-=======
 kernel-headers-5.10.42.1-3.cm1.noarch.rpm
->>>>>>> 1.0-dev
 glibc-2.28-18.cm1.aarch64.rpm
 glibc-devel-2.28-18.cm1.aarch64.rpm
 glibc-i18n-2.28-18.cm1.aarch64.rpm