PiotrP 07bf895700 Merge Conflicts		2015-11-30 17:36:32 -08:00
..
Properties	Merge Conflicts	2015-11-30 17:36:32 -08:00
Microsoft.DotNet.Tools.Test.xproj	add dotnet-test	2015-11-30 17:28:03 -08:00
Program.cs	PR Feedback	2015-11-30 17:30:25 -08:00
project.json	Merge Conflicts	2015-11-30 17:36:32 -08:00
ReportingChannel.cs	Merge Conflicts	2015-11-30 17:36:32 -08:00
TestHostTracing.cs	Merge Conflicts	2015-11-30 17:36:32 -08:00