diff options
| author | Matthieu Herrb <matthieu@deville.herrb.net> | 2008-11-22 11:31:57 +0100 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@deville.herrb.net> | 2008-11-22 11:31:57 +0100 |
| commit | 78c4bfffa179cd3a2c2d3dd07b148a23edebb7fa (patch) | |
| tree | 8ff238f3d43fb2d70d14b3bdd3600f92cb73d0f3 /os/utils.c | |
| parent | d068c7b05f4db665e35fb504c5171a51d2432d89 (diff) | |
Ooop. fix merge botches.
Diffstat (limited to 'os/utils.c')
| -rw-r--r-- | os/utils.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/os/utils.c b/os/utils.c index 4a2bdfc59..142620cae 100644 --- a/os/utils.c +++ b/os/utils.c @@ -405,8 +405,6 @@ UnlockServer(void) (void) unlink(LockFile); } } -<<<<<<< HEAD:os/utils.c -======= #ifdef X_PRIVSEP int @@ -415,8 +413,6 @@ ChownLock(uid_t uid, gid_t gid) return chown(LockFile, uid, gid); } #endif -#endif /* SERVER_LOCK */ ->>>>>>> 2b5fe87... Add privilege separation to the X server.:os/utils.c /* Force connections to close on SIGHUP from init */ |