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-parse.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-parse.el')
| -rw-r--r-- | lisp/url/url-parse.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/url/url-parse.el b/lisp/url/url-parse.el index bab39476559..dd08bc458bc 100644 --- a/lisp/url/url-parse.el +++ b/lisp/url/url-parse.el @@ -1,7 +1,7 @@ ;;; url-parse.el --- Uniform Resource Locator parser ;; Author: $Author: monnier $ -;; Created: $Date: 2004/04/04 01:21:46 $ -;; Version: $Revision: 1.1.1.1 $ +;; Created: $Date: 2004/04/04 03:10:58 $ +;; Version: $Revision: 1.2 $ ;; Keywords: comm, data, processes ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -204,3 +204,5 @@ Format is: (vector prot user pass host port file refs attr full)))))) (provide 'url-parse) + +;;; arch-tag: f338325f-71ab-4bee-93cc-78fb9a03d403 |