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-ns.el | |
| parent | 1051f1d82c3484c3197916ce6c16b40c7c147b8c (diff) | |
Resolve CVS conflicts
Diffstat (limited to 'lisp/url/url-ns.el')
| -rw-r--r-- | lisp/url/url-ns.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/url/url-ns.el b/lisp/url/url-ns.el index 0800f70700..759d2e00c1 100644 --- a/lisp/url/url-ns.el +++ b/lisp/url/url-ns.el @@ -1,7 +1,7 @@ ;;; url-ns.el --- Various netscape-ish functions for proxy definitions -;; Author: $Author: fx $ -;; Created: $Date: 2000/12/20 21:08:02 $ -;; Version: $Revision: 1.2 $ +;; Author: $Author: monnier $ +;; Created: $Date: 2004/04/04 01:21:46 $ +;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -104,3 +104,5 @@ (gethash key url-ns-user-prefs default)) (provide 'url-ns) + +;;; arch-tag: 69520992-cf97-40b4-9ad1-c866d3cae5bf |