Finished merge

dan-silver · dan-silver · commit 46c5d34addf5 · 2016-09-07T09:49:20.000-07:00
diff --git a/src/GraphODataTemplateWriter/GraphODataTemplateWriter.csproj b/src/GraphODataTemplateWriter/GraphODataTemplateWriter.csproj
@@ -116,11 +116,10 @@
     <None Include=".config\CSharpSettings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-<<<<<<< HEAD
     <None Include=".config\TypeScriptSettings.json">
-=======
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include=".config\GraphEndpointListSettings.json">
->>>>>>> master
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include=".config\JavaScriptSettings.json">
