From abe9fd4c0a4db762fefbcc8d0983abfe2f5926e8 Mon Sep 17 00:00:00 2001
From: Neal D. Becker <ndbecker2@gmail.com>
Date: Dec 23 2016 22:22:12 +0000
Subject: cosmetic


---

diff --git a/mercurial.spec b/mercurial.spec
index 6743af2..3981836 100644
--- a/mercurial.spec
+++ b/mercurial.spec
@@ -2,13 +2,9 @@
 
 Summary: Mercurial -- a distributed SCM
 Name: mercurial
-<<<<<<< HEAD
 Version: 4.0.1
 Release: 1%{?dist}
-=======
-Version: 3.8.1
-Release: 2%{?dist}
->>>>>>> efef1b380f50ab9e50ef5877f503b4040df8a62b
+
 # Release: 1.rc1%{?dist}
 
 #% define upstreamversion %{version}-rc