From bcb0555f02695dbe6ced71385b836c316dcf7776 Mon Sep 17 00:00:00 2001
From: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
Date: Wed, 1 May 2019 09:14:17 -0500
Subject: [PATCH] remove extraneous conflict marker

---
 fuse.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fuse.spec b/fuse.spec
index d881b84..fe48949 100644
--- a/fuse.spec
+++ b/fuse.spec
@@ -123,7 +123,6 @@ rm -f %{buildroot}/%{_libdir}/*.a
 %{_includedir}/fuse
 
 %changelog
-<<<<<<< HEAD
 * Mon May 01 2019 Dave Dykstra <dwd@fedoraproject.org> - 2.9.9-4
 - Separate fuse3 out into its own package