From a4357ca5ef1b2964a772336d81dbecfed9b3cb1d Mon Sep 17 00:00:00 2001
From: David Schwörer <dave@ipp.mpg.de>
Date: Sep 17 2020 19:59:49 +0000
Subject: Fix bad merge


---

diff --git a/orangefs.spec b/orangefs.spec
index a217510..202b8e6 100644
--- a/orangefs.spec
+++ b/orangefs.spec
@@ -1,11 +1,6 @@
 Name: orangefs
-<<<<<<< HEAD
 Version: 2.9.8
 Release: 1%{?dist}
-=======
-Version: 2.9.7
-Release: 9%{?dist}
->>>>>>> b9ef29d53ba2fd1d2e5395bf2166978d454d5d18
 Summary: Parallel network file system client
 URL: https://www.orangefs.org/
 # BSD (2 clause) maint/config/ssl.m4