Fix previous merge
This commit is contained in:
parent
7deedad81c
commit
d6a9d4d78e
|
@ -141,17 +141,10 @@ Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release}
|
||||||
%{summary}.
|
%{summary}.
|
||||||
|
|
||||||
%package -n qt5-linguist
|
%package -n qt5-linguist
|
||||||
<<<<<<< HEAD
|
|
||||||
Summary: Add translations to Qt5 applications
|
|
||||||
Requires: %{name}-common = %{version}-%{release}
|
|
||||||
%description -n qt5-linguist
|
|
||||||
%{summary}.
|
|
||||||
=======
|
|
||||||
Summary: Qt5 Linguist Tools
|
Summary: Qt5 Linguist Tools
|
||||||
Requires: %{name}-common = %{version}-%{release}
|
Requires: %{name}-common = %{version}-%{release}
|
||||||
%description -n qt5-linguist
|
%description -n qt5-linguist
|
||||||
Tools to add translations to Qt5 applications.
|
Tools to add translations to Qt5 applications.
|
||||||
>>>>>>> master
|
|
||||||
|
|
||||||
%package -n qt5-qdbusviewer
|
%package -n qt5-qdbusviewer
|
||||||
Summary: D-Bus debugger and viewer
|
Summary: D-Bus debugger and viewer
|
||||||
|
|
Loading…
Reference in New Issue