Fix previous merge

This commit is contained in:
Jan Grulich 2015-08-14 20:35:34 +02:00
parent 7deedad81c
commit d6a9d4d78e
1 changed files with 0 additions and 7 deletions

View File

@ -141,17 +141,10 @@ Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release}
%{summary}.
%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
Requires: %{name}-common = %{version}-%{release}
%description -n qt5-linguist
Tools to add translations to Qt5 applications.
>>>>>>> master
%package -n qt5-qdbusviewer
Summary: D-Bus debugger and viewer