diff options
| author | Miles Bader <miles@gnu.org> | 2004-04-04 04:44:10 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2004-04-04 04:44:10 +0000 |
| commit | e5566bd545c8557083a84f651b02a6090316dfed (patch) | |
| tree | 75532668fb9a7ba34639f4ad1289d357ccd5f072 /lisp/url/url-ldap.el | |
| parent | 1051f1d82c3484c3197916ce6c16b40c7c147b8c (diff) | |
| download | emacs-e5566bd545c8557083a84f651b02a6090316dfed.tar.gz | |
Resolve CVS conflicts
Diffstat (limited to 'lisp/url/url-ldap.el')
| -rw-r--r-- | lisp/url/url-ldap.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/url/url-ldap.el b/lisp/url/url-ldap.el index 67409e39a1d..b2d7980be06 100644 --- a/lisp/url/url-ldap.el +++ b/lisp/url/url-ldap.el @@ -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 |