diff lisp/url/url-parse.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-parse.el	Sun Apr 04 03:10:58 2004 +0000
+++ b/lisp/url/url-parse.el	Sun Apr 04 04:44:10 2004 +0000
@@ -1,7 +1,7 @@
 ;;; url-parse.el --- Uniform Resource Locator parser
 ;; 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
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -204,3 +204,5 @@
 	(vector prot user pass host port file refs attr full))))))
 
 (provide 'url-parse)
+
+;;; arch-tag: f338325f-71ab-4bee-93cc-78fb9a03d403