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-proxy.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-proxy.el')
| -rw-r--r-- | lisp/url/url-proxy.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/url/url-proxy.el b/lisp/url/url-proxy.el index b13a0545528..9b4fdad09e5 100644 --- a/lisp/url/url-proxy.el +++ b/lisp/url/url-proxy.el @@ -1,7 +1,7 @@ ;;; url-proxy.el --- Proxy server support -;; Author: $Author: fx $ -;; Created: $Date: 2001/10/11 21:09:35 $ -;; Version: $Revision: 1.5 $ +;; Author: $Author: monnier $ +;; Created: $Date: 2004/04/04 01:21:46 $ +;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -76,3 +76,5 @@ (url-http url-using-proxy callback cbargs))) (provide 'url-proxy) + +;;; arch-tag: 4ff8882e-e498-42b7-abc5-acb449cdbc62 |