From 3f71c3bd18e34d575411e223be81a3bb33960f6d Mon Sep 17 00:00:00 2001
From: Jordan Ogas <jogas@lanl.gov>
Date: Jan 24 2022 18:51:37 +0000
Subject: remove merge conflict non-sense


---

diff --git a/charliecloud.spec b/charliecloud.spec
index 65b399f..a0461d0 100644
--- a/charliecloud.spec
+++ b/charliecloud.spec
@@ -10,13 +10,8 @@
 %{?el7:%global __python %__python3}
 
 Name:          charliecloud
-<<<<<<< HEAD
 Version:       0.26
 Release:       1%{?dist}
-=======
-Version:       0.25
-Release:       2%{?dist}
->>>>>>> 411370edf8eb62f93475d245381b50d355135cb1
 Summary:       Lightweight user-defined software stacks for high-performance computing
 License:       ASL 2.0
 URL:           https://hpc.github.io/%{name}/