# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1075844710 0
# Node ID 75264649111c976720ec10b7c64189aa34dfa9e8
# Parent  d6d385293c014daf311b5c31b305c78f779de265
Resolve CVS conflicts

diff -r d6d385293c01 -r 75264649111c lisp/x-dnd.el
--- a/lisp/x-dnd.el	Tue Feb 03 18:15:35 2004 +0000
+++ b/lisp/x-dnd.el	Tue Feb 03 21:45:10 2004 +0000
@@ -1,4 +1,3 @@
-
 ;;; x-dnd.el --- drag and drop support for X.
 
 ;; Copyright (C) 2004
@@ -601,5 +600,4 @@
 
 (provide 'x-dnd)
 
-;;; arch-tag: ???
 ;;; x-dnd.el ends here