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-http.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-http.el')
| -rw-r--r-- | lisp/url/url-http.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index bdb6b38cf65..c0c0dd68a31 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el @@ -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 @@ p3p (provide 'url-http) +;;; arch-tag: ba7c59ae-c0f4-4a31-9617-d85f221732ee ;;; url-http.el ends here |