Bad Merge

This commit is contained in:
piotrp 2016-01-26 20:26:36 -08:00
parent ce5efda8df
commit 7b14149c8c

View file

@ -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"