fix: conflicts between shell and shell-example#670

deepin-bot[bot] merged 1 commit intolinuxdeepin:masterlinuxdeepin/dde-shell:masterfrom

tsic404:dconfig-conflictstsic404/dde-shell:dconfig-conflictsCopy head branch name to clipboard