diff options
| author | Miles Bader <miles@gnu.org> | 2004-04-04 04:44:10 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2004-04-04 04:44:10 +0000 |
| commit | e5566bd545c8557083a84f651b02a6090316dfed (patch) | |
| tree | 75532668fb9a7ba34639f4ad1289d357ccd5f072 /lisp/url/url-handlers.el | |
| parent | 1051f1d82c3484c3197916ce6c16b40c7c147b8c (diff) | |
| download | emacs-e5566bd545c8557083a84f651b02a6090316dfed.tar.gz | |
Resolve CVS conflicts
Diffstat (limited to 'lisp/url/url-handlers.el')
| -rw-r--r-- | lisp/url/url-handlers.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el index 8b6ebdf0518..d3f9800d0f0 100644 --- a/lisp/url/url-handlers.el +++ b/lisp/url/url-handlers.el @@ -1,7 +1,7 @@ ;;; url-handlers.el --- file-name-handler stuff for URL loading -;; Author: $Author: sds $ -;; Created: $Date: 2003/06/26 18:45:45 $ -;; Version: $Revision: 1.10 $ +;; Author: $Author: monnier $ +;; Created: $Date: 2004/04/04 01:21:46 $ +;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -250,3 +250,5 @@ accessible." (auto-save-mode 0))) (provide 'url-handlers) + +;;; arch-tag: 7300b99c-cc83-42ff-9147-79b2723c62ac |