From 624341d9ad32df87af3c38f2916b9f798a804f03 Mon Sep 17 00:00:00 2001
From: Sohan Kunkerkar <sohank2602@gmail.com>
Date: Thu, 4 Nov 2021 14:27:01 -0400
Subject: [PATCH] Fix the release number

---
 rust-coreos-installer.spec | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/rust-coreos-installer.spec b/rust-coreos-installer.spec
index 737789a..639893d 100644
--- a/rust-coreos-installer.spec
+++ b/rust-coreos-installer.spec
@@ -12,7 +12,7 @@
 
 Name:           rust-%{crate}
 Version:        0.10.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Installer for Fedora CoreOS and RHEL CoreOS
 
 # Upstream license specification: Apache-2.0
@@ -193,13 +193,10 @@ from the initramfs.
 %endif
 
 %changelog
-<<<<<<< HEAD
-=======
 * Thu Nov 04 2021 Sohan Kunkerkar <skunkerk@redhat.com> - 0.10.1-2
 - Vendor rust dependencies on RHEL only
 - Add coreos-installer-dracut subpackage on RHEL only
 
->>>>>>> a23a0f0 (Vendor rust dependencies on RHEL only & add coreos-installer-dracut subpackage)
 * Mon Oct 11 2021 Benjamin Gilbert <bgilbert@redhat.com> - 0.10.1-1
 - New release