fix conflict

dde-session-shell.spec

@@ -4,7 +4,7 @@
 
 Name:           dde-session-shell
 Version:        5.0.0.8
-Release:        2
+Release:        3
 Summary:        deepin-session-shell - Deepin desktop-environment - session-shell module
 License:        GPLv3+
 URL:            http://shuttle.corp.deepin.com/cache/repos/eagle/release-candidate/RERFNS4wLjAuNzYxMA/pool/main/d/dde-session-shell/
@@ -12,11 +12,11 @@ Source0:        http://shuttle.corp.deepin.com/cache/repos/eagle/release-candida
 
 BuildRequires:  cmake
 BuildRequires:  dde-daemon
-BuildRequires:  dtkcore >= 5.1
+BuildRequires:  dtkcore-devel
 BuildRequires:  gsettings-qt
 BuildRequires:  startdde
 BuildRequires:  qt5-linguist
-BuildRequires:  dtkwidget-devel >= 5.1
+BuildRequires:  dtkwidget-devel
 BuildRequires:  qt5-qtx11extras-devel
 BuildRequires:  qt5-qtmultimedia-devel
 BuildRequires:  qt5-qtsvg-devel
@@ -61,8 +61,12 @@ make
 %{_datadir}/dbus-1/services/com.deepin.dde.shutdownFront.service
 
 %changelog
-* Thu Sep 3 2020 weidong <weidong@uniontech.com> - 5.0.0.8-2
+<<<<<<< HEAD
+* Fri Sep 04 2020 weidong <weidong@uniontech.com> - 5.0.0.8-3
 - fix source url in spec
 
+* Fri Sep 04 2020 chenbo.pan <panchenbo@uniontech.com> - 5.0.0.8-2
+- fix compile error
+
 * Thu Jul 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.0.0.8-1
 - Package init