Remove merge signs from specfile
This commit is contained in:
parent
e84f669919
commit
5aebfb0d2c
@ -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}{,.*}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user