From 70337b38ae3a696f58a759f26b410dd740fc3244 Mon Sep 17 00:00:00 2001
From: weidong <weidong@uniontech.com>
Date: Fri, 4 Sep 2020 13:42:57 +0800
Subject: [PATCH] fix conflict

---
 dde-session-shell.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dde-session-shell.spec b/dde-session-shell.spec
index cda4768..31192ca 100644
--- a/dde-session-shell.spec
+++ b/dde-session-shell.spec
@@ -61,7 +61,6 @@ make
 %{_datadir}/dbus-1/services/com.deepin.dde.shutdownFront.service
 
 %changelog
-<<<<<<< HEAD
 * Fri Sep 04 2020 weidong <weidong@uniontech.com> - 5.0.0.8-3
 - fix source url in spec