diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-01-29 01:48:23 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-01-29 01:48:23 -0500 |
| commit | b68ce750ac90da4fb88669d256666dbaa39f4338 (patch) | |
| tree | cabf50b7a85d1062ba60bd3ebf45fb17965884ca /.config/systemd/user/default.target.wants | |
| parent | 15820c5e8ed6f01cf4a87b85126eb7f346ebab3d (diff) | |
| parent | 34bbf66a460e5c622e209211869b3a8bde8a68d5 (diff) | |
Merge remote-tracking branch 'origin/gluglugt60-par' into build64-par
Conflicts:
.config/login.sh
.config/lxpanel/default/config
.config/wmii-hg/config.sh
Diffstat (limited to '.config/systemd/user/default.target.wants')
5 files changed, 4 insertions, 4 deletions
diff --git a/.config/systemd/user/default.target.wants/emacs-daemon.service b/.config/systemd/user/default.target.wants/emacs-daemon.service index 5a3b3f7..e3a3cc0 120000 --- a/.config/systemd/user/default.target.wants/emacs-daemon.service +++ b/.config/systemd/user/default.target.wants/emacs-daemon.service @@ -1 +1 @@ -/home/luke/.config/systemd/user/emacs-daemon.service
\ No newline at end of file +../emacs-daemon.service
\ No newline at end of file diff --git a/.config/systemd/user/default.target.wants/maildirproc@att.service b/.config/systemd/user/default.target.wants/maildirproc@att.service index 1079515..13e527c 120000 --- a/.config/systemd/user/default.target.wants/maildirproc@att.service +++ b/.config/systemd/user/default.target.wants/maildirproc@att.service @@ -1 +1 @@ -/home/luke/.config/systemd/user/maildirproc@.service
\ No newline at end of file +../maildirproc@.service
\ No newline at end of file diff --git a/.config/systemd/user/default.target.wants/maildirproc@purdue.service b/.config/systemd/user/default.target.wants/maildirproc@purdue.service index 1079515..13e527c 120000 --- a/.config/systemd/user/default.target.wants/maildirproc@purdue.service +++ b/.config/systemd/user/default.target.wants/maildirproc@purdue.service @@ -1 +1 @@ -/home/luke/.config/systemd/user/maildirproc@.service
\ No newline at end of file +../maildirproc@.service
\ No newline at end of file diff --git a/.config/systemd/user/default.target.wants/vncserver@1.service b/.config/systemd/user/default.target.wants/vncserver@1.service deleted file mode 120000 index 2dcf488..0000000 --- a/.config/systemd/user/default.target.wants/vncserver@1.service +++ /dev/null @@ -1 +0,0 @@ -/home/luke/.config/systemd/user/vncserver@.service
\ No newline at end of file diff --git a/.config/systemd/user/default.target.wants/vncserver@:1.service b/.config/systemd/user/default.target.wants/vncserver@:1.service new file mode 120000 index 0000000..20fe495 --- /dev/null +++ b/.config/systemd/user/default.target.wants/vncserver@:1.service @@ -0,0 +1 @@ +../vncserver@.service
\ No newline at end of file |