diff options
| author | dawes <dawes> | 1994-05-22 08:50:59 +0000 |
|---|---|---|
| committer | dawes <dawes> | 1994-05-22 08:50:59 +0000 |
| commit | e2432b5d8eec76f76d060102f624afa8be9c2ffc (patch) | |
| tree | 6c58e77b6acc19d911ab3e496a185a066718a494 | |
| parent | 520a25778ec32e51394e4b1922b75ce589e48215 (diff) | |
Fix merge problem
| -rw-r--r-- | lib/X11/ConnDis.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/X11/ConnDis.c b/lib/X11/ConnDis.c index 1092ca12a..3b34a9fb7 100644 --- a/lib/X11/ConnDis.c +++ b/lib/X11/ConnDis.c @@ -1,5 +1,5 @@ /* $XConsortium: ConnDis.c,v 11.122 94/05/05 13:13:24 mor Exp $ */ -/* $XFree86: xc/lib/X11/ConnDis.c,v 3.2 1994/05/21 23:45:49 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ConnDis.c,v 3.3 1994/05/22 06:44:38 dawes Exp $ */ /* Copyright (c) 1989 X Consortium @@ -160,14 +160,10 @@ _X11TransConnectDisplay (display_name, fullnamep, dpynump, screenp, /* check if phostname == localnodename */ if (phostname && uname(&sys) >= 0 && !strncmp(phostname, sys.nodename, strlen(sys.nodename))) -<<<<<<< ConnDis.c - phostname = copystring("unix", 4); -======= { Xfree (phostname); phostname = copystring ("unix", 4); } ->>>>>>> 1.1.1.2 #endif |