Merge changes from develop

Comments and whitespace
Skip file-locking and cache changes

1 files changed, 1 insertions, 1 deletions

diff --git a/test/vfd.c b/test/vfd.c
index 076273b..fb20c50 100644
--- a/test/vfd.c
+++ b/test/vfd.c
@@ -3336,7 +3336,7 @@ main(void)
     nerrors += test_stdio() < 0 ? 1 : 0;
     nerrors += test_windows() < 0 ? 1 : 0;
     nerrors += test_ros3() < 0 ? 1 : 0;
-/*    nerrors += test_splitter() < 0 ? 1 : 0; */
+    /*    nerrors += test_splitter() < 0 ? 1 : 0; */
 
     if (nerrors) {
         HDprintf("***** %d Virtual File Driver TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");