Mercurial > emacs
diff lisp/url/url-cookie.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-cookie.el Sun Apr 04 03:10:58 2004 +0000 +++ b/lisp/url/url-cookie.el Sun Apr 04 04:44:10 2004 +0000 @@ -1,7 +1,7 @@ ;;; url-cookie.el --- Netscape Cookie support -;; Author: $Author: wmperry $ -;; Created: $Date: 2002/10/29 14:44:59 $ -;; Version: $Revision: 1.7 $ +;; Author: $Author: monnier $ +;; Created: $Date: 2004/04/04 01:21:46 $ +;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -466,3 +466,4 @@ (provide 'url-cookie) +;;; arch-tag: 2568751b-6452-4398-aa2d-303edadb54d7