resolve merge conflict
This commit is contained in:
+1
-6
@@ -2,12 +2,7 @@
|
|||||||
Description=Sunshine Gamestream Server for Moonlight
|
Description=Sunshine Gamestream Server for Moonlight
|
||||||
|
|
||||||
[Service]
|
[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@
|
ExecStart=@SUNSHINE_EXECUTABLE_PATH@
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=default.target
|
WantedBy=graphical-session.target
|
||||||
|
|||||||
Reference in New Issue
Block a user