remove extraneous conflict marker
This commit is contained in:
parent
76a21963a9
commit
bcb0555f02
@ -123,7 +123,6 @@ rm -f %{buildroot}/%{_libdir}/*.a
|
|||||||
%{_includedir}/fuse
|
%{_includedir}/fuse
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
<<<<<<< HEAD
|
|
||||||
* Mon May 01 2019 Dave Dykstra <dwd@fedoraproject.org> - 2.9.9-4
|
* Mon May 01 2019 Dave Dykstra <dwd@fedoraproject.org> - 2.9.9-4
|
||||||
- Separate fuse3 out into its own package
|
- Separate fuse3 out into its own package
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user