More merge conflicts

[xfstests-dev.git] / 040

diff --git a/040 b/040
index 4bbd8d4229ca676acfdc6e469d17bb65f565634e..399bf9afcac0fd68bf4e5daf750792ba26664261 100755 (executable)
--- a/040
+++ b/040
@@ -1,5 +1,5 @@
 #! /bin/sh
-# XFS QA Test No. 040
+# FS QA Test No. 040
 #
 # srcdiff test
 #