diff options
| author | Miles Bader <[email protected]> | 2004-04-04 04:44:10 +0000 |
|---|---|---|
| committer | Miles Bader <[email protected]> | 2004-04-04 04:44:10 +0000 |
| commit | e5566bd545c8557083a84f651b02a6090316dfed (patch) | |
| tree | 75532668fb9a7ba34639f4ad1289d357ccd5f072 /lisp/url/url-cid.el | |
| parent | 1051f1d82c3484c3197916ce6c16b40c7c147b8c (diff) | |
Resolve CVS conflicts
Diffstat (limited to 'lisp/url/url-cid.el')
| -rw-r--r-- | lisp/url/url-cid.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/url/url-cid.el b/lisp/url/url-cid.el index be380387ac..38ddd002da 100644 --- a/lisp/url/url-cid.el +++ b/lisp/url/url-cid.el @@ -1,7 +1,7 @@ ;;; url-cid.el --- Content-ID URL loader -;; Author: $Author: fx $ -;; Created: $Date: 2001/05/05 16:35:58 $ -;; Version: $Revision: 1.3 $ +;; Author: $Author: monnier $ +;; Created: $Date: 2004/04/04 01:21:46 $ +;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -63,3 +63,5 @@ (url-cid-gnus (url-filename url)))) (t (message "Unable to handle CID URL: %s" url)))) + +;;; arch-tag: 23d9ab74-fad4-4dba-b1e7-292871e8bda5 |