remove extraneous conflict marker

2019-05-01 09:14:17 -05:00 · 2019-05-01 09:14:17 -05:00 · bcb0555f02
commit bcb0555f02
parent 76a21963a9
1 changed files with 0 additions and 1 deletions
--- 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