Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 54698:ee631551cb0a | 54699:7784ae10206d |
|---|---|
| 1 ;;; url-ldap.el --- LDAP Uniform Resource Locator retrieval code | 1 ;;; url-ldap.el --- LDAP Uniform Resource Locator retrieval code |
| 2 ;; Author: $Author: wmperry $ | 2 ;; Author: $Author: monnier $ |
| 3 ;; Created: $Date: 1999/11/26 12:11:50 $ | 3 ;; Created: $Date: 2004/04/04 01:21:46 $ |
| 4 ;; Version: $Revision: 1.1.1.1 $ | 4 ;; Version: $Revision: 1.1.1.1 $ |
| 5 ;; Keywords: comm, data, processes | 5 ;; Keywords: comm, data, processes |
| 6 | 6 |
| 7 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 7 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
| 8 ;;; Copyright (c) 1998 - 1999 Free Software Foundation, Inc. | 8 ;;; Copyright (c) 1998 - 1999 Free Software Foundation, Inc. |
| 229 " </body>\n" | 229 " </body>\n" |
| 230 "</html>\n"))) | 230 "</html>\n"))) |
| 231 (current-buffer))) | 231 (current-buffer))) |
| 232 | 232 |
| 233 (provide 'url-ldap) | 233 (provide 'url-ldap) |
| 234 | |
| 235 ;;; arch-tag: 6230e21c-41ae-4174-bd83-82c835676fc8 |