diff lisp/url/url-methods.el @ 54699:7784ae10206d

Resolve CVS conflicts
author Miles Bader <miles@gnu.org>
date Sun, 04 Apr 2004 04:44:10 +0000
parents ee631551cb0a
children e8824c4f5f7e 1029206e72f2
line wrap: on
line diff
--- a/lisp/url/url-methods.el	Sun Apr 04 03:10:58 2004 +0000
+++ b/lisp/url/url-methods.el	Sun Apr 04 04:44:10 2004 +0000
@@ -1,7 +1,7 @@
 ;;; url-methods.el --- Load URL schemes as needed
 ;; Author: $Author: monnier $
-;; Created: $Date: 2004/04/04 01:21:46 $
-;; Version: $Revision: 1.1.1.1 $
+;; Created: $Date: 2004/04/04 03:10:58 $
+;; Version: $Revision: 1.2 $
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -146,3 +146,5 @@
 	(plist-get url-scheme-default-properties property))))
 
 (provide 'url-methods)
+
+;;; arch-tag: 336863f8-5a07-4906-9be5-b3c6bcebbe67