From: Miles Bader <miles@gnu.org>
Date: Tue, 3 Feb 2004 21:46:35 +0000 (+0000)
Subject: Resolve CVS conflicts
X-Git-Tag: ttn-vms-21-2-B4~7757
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=95e224b7e32edf56ad482832775eb814e2e7a36c;p=emacs.git

Resolve CVS conflicts
---

diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index ef9bb5fc08c..18fcb62d6bf 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -1,4 +1,3 @@
-
 ;;; x-dnd.el --- drag and drop support for X.
 
 ;; Copyright (C) 2004
@@ -601,5 +600,5 @@ FORMAT is 32 (not used).  MESSAGE is the data part of an XClientMessageEvent."
 
 (provide 'x-dnd)
 
-;;; arch-tag: ???
+;;; arch-tag: b621fb7e-50da-4323-850b-5fc71ae64621
 ;;; x-dnd.el ends here