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-cache.el | |
| parent | 1051f1d82c3484c3197916ce6c16b40c7c147b8c (diff) | |
| download | emacs-e5566bd545c8557083a84f651b02a6090316dfed.tar.gz emacs-e5566bd545c8557083a84f651b02a6090316dfed.tar.bz2 emacs-e5566bd545c8557083a84f651b02a6090316dfed.zip | |
Resolve CVS conflicts
Diffstat (limited to 'lisp/url/url-cache.el')
| -rw-r--r-- | lisp/url/url-cache.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el index a6bf2847dd6..7a6cc21383e 100644 --- a/lisp/url/url-cache.el +++ b/lisp/url/url-cache.el @@ -1,7 +1,7 @@ ;;; url-cache.el --- Uniform Resource Locator retrieval tool -;; Author: $Author: fx $ -;; Created: $Date: 2002/01/22 17:53:45 $ -;; Version: $Revision: 1.4 $ +;; Author: $Author: monnier $ +;; Created: $Date: 2004/04/04 01:21:46 $ +;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -201,3 +201,5 @@ FILE can be created or overwritten." (t nil)))) (provide 'url-cache) + +;;; arch-tag: 95b050a6-8e81-4f23-8e63-191b9d1d657c |