From 7b14149c8ccd35cd83b242646d6186442f93b836 Mon Sep 17 00:00:00 2001 From: piotrp Date: Tue, 26 Jan 2016 20:26:36 -0800 Subject: [PATCH] Bad Merge --- src/Microsoft.DotNet.Tools.New/project.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.DotNet.Tools.New/project.json b/src/Microsoft.DotNet.Tools.New/project.json index ae882bbc9..e471aa0a1 100644 --- a/src/Microsoft.DotNet.Tools.New/project.json +++ b/src/Microsoft.DotNet.Tools.New/project.json @@ -15,7 +15,7 @@ } }, "compileExclude": [ "CSharp_Console/**", "FSharp_Console/**" ], - "resource": [ "CSharp_Console/NuGet.Config", "CSharp_Console/Program.cs", "CSharp_Console/project.json", "FSharp_Console/NuGet.config, "FSharp_Console/Program.fs", "FSharp_Console/project.json"], + "resource": [ "CSharp_Console/NuGet.Config", "CSharp_Console/Program.cs", "CSharp_Console/project.json", "FSharp_Console/NuGet.config", "FSharp_Console/Program.fs", "FSharp_Console/project.json"], "frameworks": { "dnxcore50": { "imports": "portable-net451+win8"