comparison lisp/url/vc-dav.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
2 2
3 ;; Copyright (C) 2001 Free Software Foundation, Inc. 3 ;; Copyright (C) 2001 Free Software Foundation, Inc.
4 4
5 ;; Author: Bill Perry <wmperry@gnu.org> 5 ;; Author: Bill Perry <wmperry@gnu.org>
6 ;; Maintainer: Bill Perry <wmperry@gnu.org> 6 ;; Maintainer: Bill Perry <wmperry@gnu.org>
7 ;; Version: $Revision: 1.3 $ 7 ;; Version: $Revision: 1.1.1.1 $
8 ;; Keywords: url, vc 8 ;; Keywords: url, vc
9 9
10 ;; GNU Emacs is free software; you can redistribute it and/or modify 10 ;; GNU Emacs is free software; you can redistribute it and/or modify
11 ;; it under the terms of the GNU General Public License as published by 11 ;; it under the terms of the GNU General Public License as published by
12 ;; the Free Software Foundation; either version 2, or (at your option) 12 ;; the Free Software Foundation; either version 2, or (at your option)
173 ;; vc-dav-unregister(url) 173 ;; vc-dav-unregister(url)
174 ;; Unregister URL. Not possible with WebDAV, other than by 174 ;; Unregister URL. Not possible with WebDAV, other than by
175 ;; deleting the resource. 175 ;; deleting the resource.
176 176
177 (provide 'vc-dav) 177 (provide 'vc-dav)
178
179 ;;; arch-tag: 0a0fb9fe-8190-4c0a-a179-5c291d3a467e