Mercurial > emacs
diff lisp/url/url-proxy.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-proxy.el Sun Apr 04 03:10:58 2004 +0000 +++ b/lisp/url/url-proxy.el Sun Apr 04 04:44:10 2004 +0000 @@ -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