[telegram-desktop/f38: 2/2] Fix conflict.

commit 4f4a20151edff3ce10853af7da5af0f2b71c09e3 Merge: ca1b99c ea65018 Author: Vasiliy Glazov <vascom2(a)gmail.com&gt; Date: Tue Dec 12 14:41:06 2023 +0300 Fix conflict. telegram-desktop.spec | 3 +++ 1 file changed, 3 insertions(+) --- diff --cc telegram-desktop.spec index 69517f1,eb2fc30..d2edd11 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@@ -161,9 -162,9 +161,12 @@@ desktop-file-validate %{buildroot}%{_da %{_metainfodir}/*.metainfo.xml %changelog +* Tue Dec 12 2023 Vasiliy Glazov <vascom2(a)gmail.com&gt; - 4.8.4-4 +- Switch to Qt5 + + * Sun Nov 19 2023 Sérgio Basto <sergio(a)serjux.com&gt; - 4.8.4-3.1 + - Rebuilt for Qt_6.6_PRIVATE_API + * Fri Jul 28 2023 Vasiliy Glazov <vascom2(a)gmail.com&gt; - 4.8.4-3 - Rebuild for new Qt 6