Resolve merge conflicts

Author: nums11

Samples/WinMLSamplesGallery/.gitignore

@@ -1,6 +1,11 @@
 *.onnx
 !squeezenet1.1-7-batched.onnx
 !encrypted.onnx
+<<<<<<< HEAD
 !mosaic.onnx
 !efficientnet-lite4-11.onnx
 !dx_preprocessor_efficient_net.onnx
+=======
+!efficientnet-lite4-11.onnx
+!dx_preprocessor_efficient_net.onnx
+>>>>>>> master

Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/WinMLSamplesGalleryNative.vcxproj.filters

@@ -116,7 +116,10 @@
     <ClInclude Include="Win32Application.h">
       <Filter>DXResourceBinding</Filter>
     </ClInclude>
+<<<<<<< HEAD
     <ClInclude Include="WeakBuffer.h" />
+=======
+>>>>>>> master
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Resource.rc" />