Mercurial > emacs
diff lisp/url/url-http.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-http.el Sun Apr 04 03:10:58 2004 +0000 +++ b/lisp/url/url-http.el Sun Apr 04 04:44:10 2004 +0000 @@ -1,6 +1,6 @@ ;;; url-http.el --- HTTP retrieval routines ;; Author: Bill Perry <wmperry@gnu.org> -;; Version: $Revision: 1.39 $ +;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -1220,4 +1220,5 @@ (provide 'url-http) +;;; arch-tag: ba7c59ae-c0f4-4a31-9617-d85f221732ee ;;; url-http.el ends here