fix conflict
This commit is contained in:
parent
c1e1224e1b
commit
70337b38ae
@ -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
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user