Mercurial > emacs
diff lisp/url/url-vars.el @ 54699:7784ae10206d
Resolve CVS conflicts
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sun, 04 Apr 2004 04:44:10 +0000 |
| parents | 3fb37923e567 |
| children | e8824c4f5f7e 1029206e72f2 |
line wrap: on
line diff
--- a/lisp/url/url-vars.el Sun Apr 04 03:10:58 2004 +0000 +++ b/lisp/url/url-vars.el Sun Apr 04 04:44:10 2004 +0000 @@ -1,7 +1,7 @@ ;;; url-vars.el --- Variables for Uniform Resource Locator tool -;; Author: $Author: fx $ -;; Created: $Date: 2002/04/22 09:25:02 $ -;; Version: $Revision: 1.14 $ +;; Author: $Author: monnier $ +;; Created: $Date: 2004/04/04 01:21:46 $ +;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -432,4 +432,5 @@ (provide 'url-vars) +;;; arch-tag: 29205e5f-c5ce-433c-8d5d-38cbaed64b49 ;;; url-vars.el ends here