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

Resolve CVS conflicts
author Miles Bader <miles@gnu.org>
date Sun, 04 Apr 2004 04:44:10 +0000
parents 3fb37923e567
children e8824c4f5f7e 1029206e72f2
line wrap: on
line diff
--- a/lisp/url/url-history.el	Sun Apr 04 03:10:58 2004 +0000
+++ b/lisp/url/url-history.el	Sun Apr 04 04:44:10 2004 +0000
@@ -1,7 +1,7 @@
 ;;; url-history.el --- Global history tracking for URL package
-;; Author: $Author: fx $
-;; Created: $Date: 2001/05/05 16:49:52 $
-;; Version: $Revision: 1.6 $
+;; Author: $Author: monnier $
+;; Created: $Date: 2004/04/04 01:21:46 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -197,3 +197,5 @@
     (error "url-completion-function very confused."))))
 
 (provide 'url-history)
+
+;;; arch-tag: fbbbaf63-db36-4e88-bc9f-2939aa93afb2