clean up from merge

Author: linnealovespie

Samples/StyleTransfer/AppViewModel.cs

@@ -391,7 +391,7 @@ public async Task ChangeLiveStream()
                 var modelPath = Path.GetFullPath($"./Assets/{_appModel.ModelSource}.onnx");
                 videoEffectDefinition = new VideoEffectDefinition(_videoEffectID, new PropertySet() {
                     {"ModelName", modelPath },
-                    {"UseGPU", UseGpu },
+                    {"UseGpu", UseGpu },
                     { "Notifier", m_notifier} });
                 videoEffect = await _mediaCapture.AddVideoEffectAsync(videoEffectDefinition, MediaStreamType.VideoPreview);
 

Samples/StyleTransfer/StyleTransfer.csproj

@@ -237,15 +237,15 @@
     <Content Include="Assets\udnie.onnx" />
     <PRIResource Include="Strings\en-US\Resources.resw" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="StyleTransfer_TemporaryKey.pfx" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="VideoEffect\StyleTransferEffectCpp\StyleTransferEffectCpp.vcxproj">
       <Project>{05dffb01-62c4-458c-be13-7a97e8583e43}</Project>
       <Name>StyleTransferEffectCpp</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="StyleTransfer_TemporaryKey.pfx" />
-  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>