aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/url/url-imap.el
diff options
context:
space:
mode:
authorMiles Bader <[email protected]>2004-04-04 04:44:10 +0000
committerMiles Bader <[email protected]>2004-04-04 04:44:10 +0000
commite5566bd545c8557083a84f651b02a6090316dfed (patch)
tree75532668fb9a7ba34639f4ad1289d357ccd5f072 /lisp/url/url-imap.el
parent1051f1d82c3484c3197916ce6c16b40c7c147b8c (diff)
Resolve CVS conflicts
Diffstat (limited to 'lisp/url/url-imap.el')
-rw-r--r--lisp/url/url-imap.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/url/url-imap.el b/lisp/url/url-imap.el
index 3d143759cf..d5f1813a29 100644
--- a/lisp/url/url-imap.el
+++ b/lisp/url/url-imap.el
@@ -1,7 +1,7 @@
;;; url-imap.el --- IMAP retrieval routines
;; Author: Simon Josefsson <[email protected]>
-;; Created: $Date: 2002/01/22 17:52:16 $
-;; Version: $Revision: 1.4 $
+;; Created: $Date: 2004/04/04 01:21:46 $
+;; Version: $Revision: 1.1.1.1 $
;; Keywords: comm, data, processes
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -79,3 +79,5 @@
;; xxx list messages in mailbox (start gnus?)
)))
(current-buffer)))
+
+;;; arch-tag: 034991ff-5425-48ea-b911-c96c90e6f47d