diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-01-29 12:01:56 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-01-29 12:01:56 -0500 |
| commit | a19e716cf26fa4a67fe676d0822c96425d528903 (patch) | |
| tree | b237a4215bebfac6276cb82f40989b096630b995 /.config/systemd/user | |
| parent | 92b374462206241b6b809c3649a3d84324d43188 (diff) | |
| parent | b844c786dbb22a45a218e183dcecd58cdbb66025 (diff) | |
Merge remote-tracking branch 'origin/build64-par' into gluglugt60-par
Diffstat (limited to '.config/systemd/user')
| -rw-r--r-- | .config/systemd/user/vncserver@.service | 1 | ||||
| -rw-r--r-- | .config/systemd/user/x0vncserver@.service | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/.config/systemd/user/vncserver@.service b/.config/systemd/user/vncserver@.service index ef83ef2..8c1d818 100644 --- a/.config/systemd/user/vncserver@.service +++ b/.config/systemd/user/vncserver@.service @@ -1,5 +1,6 @@ [Unit] Description=VNC desktop +Conflicts=x0vncserver@%i.service [Service] Type=simple diff --git a/.config/systemd/user/x0vncserver@.service b/.config/systemd/user/x0vncserver@.service index 476e822..02165a7 100644 --- a/.config/systemd/user/x0vncserver@.service +++ b/.config/systemd/user/x0vncserver@.service @@ -1,5 +1,6 @@ [Unit] Description=VNC server for X displays +Conflicts=vncserver@%i.service [Service] Type=simple |