summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-12-06 18:51:45 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-12-06 18:51:45 +0000
commit41bdef7f793b5c073776fbd3b23f6b33d7fdc04f (patch)
tree19723b7a1d8c91cd91095550b6d0fbd3ead9b625
parent521d8678870697e30e39ca6afda171a230e7b4a6 (diff)
fix bad merge
-rw-r--r--chooser.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/chooser.c b/chooser.c
index e5c2457..6e46fbf 100644
--- a/chooser.c
+++ b/chooser.c
@@ -1,5 +1,5 @@
/*
- * $XdotOrg: chooser.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $
+ * $XdotOrg: xc/programs/xdm/chooser.c,v 1.1.4.3 2003/12/06 13:24:29 kaleb Exp $
* $Xorg: chooser.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $
*
Copyright 1990, 1998 The Open Group
@@ -765,7 +765,6 @@ RegisterHostname (char *name)
#endif /* IPv6 */
}
}
-#endif /* __GNU__ */
static ARRAYofARRAY8 AuthenticationNames;