From 14c0278485d691d276fa86592b2af5669812b139 Mon Sep 17 00:00:00 2001
From: wangzengliang <wangzengliang1@huawei.com>
Date: Mon, 14 Mar 2022 01:45:56 +0000
Subject: [PATCH] update ceph.spec.

---
 ceph.spec | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ceph.spec b/ceph.spec
index 57e2393..33c23ca 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -125,11 +125,7 @@
 #################################################################################
 Name:		ceph
 Version:	16.2.7
-<<<<<
 Release:	2
-=======
-Release:	1
->>>>>>> openEuler-22.03-LTS
 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
 Epoch:		2
 %endif