From e5566bd545c8557083a84f651b02a6090316dfed Mon Sep 17 00:00:00 2001
From: Miles Bader
Date: Sun, 4 Apr 2004 04:44:10 +0000
Subject: Resolve CVS conflicts

---
 lisp/url/url-https.el | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'lisp/url/url-https.el')

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 @@
 ;;; 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
-- 
cgit v1.2.1