Remove merge signs from specfile

This commit is contained in:
Tomas Korbar 2021-08-06 14:28:28 +02:00
parent e84f669919
commit 5aebfb0d2c

View File

@ -99,7 +99,6 @@ cp -a doc/html %{buildroot}/%{_docdir}/libyang/html
%files devel-doc
%{_docdir}/libyang/
<<<<<<< HEAD
%files cpp
%{_libdir}/libyang-cpp.so.%{somajor}{,.*}