Mercurial > emacs
diff lisp/url/url-ldap.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-ldap.el Sun Apr 04 03:10:58 2004 +0000 +++ b/lisp/url/url-ldap.el Sun Apr 04 04:44:10 2004 +0000 @@ -1,6 +1,6 @@ ;;; url-ldap.el --- LDAP Uniform Resource Locator retrieval code -;; Author: $Author: wmperry $ -;; Created: $Date: 1999/11/26 12:11:50 $ +;; Author: $Author: monnier $ +;; Created: $Date: 2004/04/04 01:21:46 $ ;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes @@ -231,3 +231,5 @@ (current-buffer))) (provide 'url-ldap) + +;;; arch-tag: 6230e21c-41ae-4174-bd83-82c835676fc8