Merge branch 'master' into iambmelt/working

Brian Melton · Brian Melton · commit 88ef8a44db10 · 2016-09-22T13:54:05.000-07:00
diff --git a/src/GraphODataTemplateWriter/GraphODataTemplateWriter.csproj b/src/GraphODataTemplateWriter/GraphODataTemplateWriter.csproj
@@ -95,9 +95,6 @@
     <None Include=".config\GraphEndpointListSettings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include=".config\JavaScriptSettings.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Include=".config\AndroidSettings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
