Author: rhuijben
Revision: 1623760
Modified property: svn:log
Modified: svn:log at Tue Sep 9 11:48:14 2014
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Tue Sep 9 11:48:14 2014
@@ -2,3 +2,4 @@
(special_paths_in_repos): Remove Wimp marker. Disable the '\' test on Windows
for DAV, as that character is specialized in httpd on Windows.
(Probably for security reasons)
+ (automatic_conflict_resolution): Accidental comment change.