diff 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
line wrap: on
line diff
--- a/lisp/url/vc-dav.el	Sun Apr 04 03:10:58 2004 +0000
+++ b/lisp/url/vc-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.3 $
+;; Version: $Revision: 1.1.1.1 $
 ;; Keywords: url, vc
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
@@ -175,3 +175,5 @@
 ;;    deleting the resource.
 
 (provide 'vc-dav)
+
+;;; arch-tag: 0a0fb9fe-8190-4c0a-a179-5c291d3a467e