Mercurial > emacs
diff lisp/url/url-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 |
line wrap: on
line diff
--- a/lisp/url/url-dav.el Sun Apr 04 03:10:58 2004 +0000 +++ b/lisp/url/url-dav.el Sun Apr 04 04:44:10 2004 +0000 @@ -4,7 +4,7 @@ ;; Author: Bill Perry <wmperry@gnu.org> ;; Maintainer: Bill Perry <wmperry@gnu.org> -;; Version: $Revision: 1.6 $ +;; Version: $Revision: 1.1.1.1 $ ;; Keywords: url, vc ;; GNU Emacs is free software; you can redistribute it and/or modify @@ -971,3 +971,5 @@ ;;; Miscellaneous stuff. (provide 'url-dav) + +;;; arch-tag: 2b14b7b3-888a-49b8-a490-17276a40e78e