fix merge issues

tests/xharness/AppRunner.cs

@@ -487,7 +487,7 @@ namespace xharness
 			case "FILE":
 				var fn = listener_log.FullPath + ".tmp";
 				listener = new SimpleFileListener (fn);
-				args.Append (" -setenv=NUNIT_LOG_FILE=").Append (Harness.Quote (fn));
+				args.Append (" -setenv=NUNIT_LOG_FILE=").Append (StringUtils.Quote (fn));
 				break;
 			case "HTTP":
 				listener = new SimpleHttpListener ();

tests/xharness/xharness.csproj

@@ -84,10 +84,5 @@
     </Compile>
     <Compile Include="SimpleFileListener.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\..\jenkins\nunit-summary.xslt">
-      <Link>nunit-summary.xslt</Link>
-    </EmbeddedResource>
-  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>