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

diff -r 75264649111c -r 1f2fa74fb0aa lisp/x-dnd.el
--- a/lisp/x-dnd.el	Tue Feb 03 21:45:10 2004 +0000
+++ b/lisp/x-dnd.el	Tue Feb 03 21:46:35 2004 +0000
@@ -600,4 +600,5 @@
 
 (provide 'x-dnd)
 
+;;; arch-tag: b621fb7e-50da-4323-850b-5fc71ae64621
 ;;; x-dnd.el ends here