(x_delete_display): Fix merge error.

2 files changed, 2 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6181aeb59dc..802a4a3ff90 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2008-09-02  Andreas Schwab  <schwab@suse.de>
 
+        * xterm.c (x_delete_display): Fix merge error.
+
         * fileio.c (Fexpand_file_name): Remove unused variables.
 
 2008-09-02  Eli Zaretskii  <eliz@gnu.org>
diff --git a/src/xterm.c b/src/xterm.c
index 603ec993af2..88fb04d665e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10516,7 +10516,6 @@ x_delete_display (dpyinfo)
   /* Xt and GTK do this themselves.  */
 #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
 #ifndef AIX             /* On AIX, XCloseDisplay calls this.  */
-  /* Xt and GTK does this themselves. */
   XrmDestroyDatabase (dpyinfo->xrdb);
 #endif
 #endif