Fix merge error (#18)

tools/clang/unittests/HLSL/ValidationTest.cpp

@@ -965,7 +965,7 @@ TEST_F(ValidationTest, StructBitCast) {
 }
 
 TEST_F(ValidationTest, MultiDimArray) {
-  RewriteAssemblyCheckMsg(L"..\\CodeGenHLSL\\staticGlobals.hlsl", "ps_5_0",
+  RewriteAssemblyCheckMsg(L"..\\CodeGenHLSL\\staticGlobals.hlsl", "ps_6_0",
                           "%1 = alloca [4 x float]",
                           "%1 = alloca [4 x float]\n"
                           "  %md = alloca [2 x [4 x float]]",