diff options
| author | Miles Bader | 2004-04-04 04:44:10 +0000 |
|---|---|---|
| committer | Miles Bader | 2004-04-04 04:44:10 +0000 |
| commit | e5566bd545c8557083a84f651b02a6090316dfed (patch) | |
| tree | 75532668fb9a7ba34639f4ad1289d357ccd5f072 /lisp/url/url-https.el | |
| parent | 1051f1d82c3484c3197916ce6c16b40c7c147b8c (diff) | |
| download | emacs-e5566bd545c8557083a84f651b02a6090316dfed.tar.gz emacs-e5566bd545c8557083a84f651b02a6090316dfed.zip | |
Resolve CVS conflicts
Diffstat (limited to 'lisp/url/url-https.el')
| -rw-r--r-- | lisp/url/url-https.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/url/url-https.el b/lisp/url/url-https.el index 27652792d49..d603740357e 100644 --- a/lisp/url/url-https.el +++ b/lisp/url/url-https.el | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ;;; url-https.el --- HTTP over SSL routines | 1 | ;;; url-https.el --- HTTP over SSL routines |
| 2 | ;; Author: $Author: wmperry $ | 2 | ;; Author: $Author: monnier $ |
| 3 | ;; Created: $Date: 2001/11/22 14:32:13 $ | 3 | ;; Created: $Date: 2004/04/04 01:21:46 $ |
| 4 | ;; Version: $Revision: 1.3 $ | 4 | ;; Version: $Revision: 1.1.1.1 $ |
| 5 | ;; Keywords: comm, data, processes | 5 | ;; Keywords: comm, data, processes |
| 6 | 6 | ||
| 7 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 7 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
| @@ -51,3 +51,5 @@ | |||
| 51 | (url-https-create-secure-wrapper file-attributes (url)) | 51 | (url-https-create-secure-wrapper file-attributes (url)) |
| 52 | 52 | ||
| 53 | (provide 'url-https) | 53 | (provide 'url-https) |
| 54 | |||
| 55 | ;;; arch-tag: c3645ac5-c248-4d12-ad41-7c4b6f7b6d19 | ||