mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-04-27 16:51:06 -07:00
Resolve CVS conflicts
This commit is contained in:
parent
1051f1d82c
commit
e5566bd545
31 changed files with 137 additions and 79 deletions
|
|
@ -1,7 +1,7 @@
|
|||
;;; url-https.el --- HTTP over SSL routines
|
||||
;; Author: $Author: wmperry $
|
||||
;; Created: $Date: 2001/11/22 14:32:13 $
|
||||
;; Version: $Revision: 1.3 $
|
||||
;; Author: $Author: monnier $
|
||||
;; Created: $Date: 2004/04/04 01:21:46 $
|
||||
;; Version: $Revision: 1.1.1.1 $
|
||||
;; Keywords: comm, data, processes
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
|
@ -51,3 +51,5 @@
|
|||
(url-https-create-secure-wrapper file-attributes (url))
|
||||
|
||||
(provide 'url-https)
|
||||
|
||||
;;; arch-tag: c3645ac5-c248-4d12-ad41-7c4b6f7b6d19
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue