resolve merge conflict

This commit is contained in:
loki 2021-05-10 01:03:41 +02:00
commit e834f375fb

View File

@ -2,12 +2,7 @@
Description=Sunshine Gamestream Server for Moonlight
[Service]
WorkingDirectory=/home/%u
Environment="DISPLAY=:0"
Type=simple
# wait for Xorg
ExecStartPre=/bin/sh -c 'while ! pgrep Xorg; do sleep 2; done'
ExecStart=@SUNSHINE_EXECUTABLE_PATH@
[Install]
WantedBy=default.target
WantedBy=graphical-session.target