Fix merge conflicts
authorStephen Toub <stoub@microsoft.com>
Fri, 24 Jun 2016 13:56:12 +0000 (09:56 -0400)
committerStephen Toub <stoub@microsoft.com>
Fri, 24 Jun 2016 13:56:12 +0000 (09:56 -0400)
commit9b97d1fd4c220e557ab9b1d0e062f4c3c0619ab3
treeaeb6ef1eb7c2345ce678587d28eda64cdf819717
parent38b4405a154711927adfff10aaaaa90b36de2091
Fix merge conflicts

Commit migrated from https://github.com/dotnet/corefx/commit/d438a14ca18adad326a6bc2c5f9523fb116e477e
src/libraries/Common/test-runtime/project.json
src/libraries/System.Diagnostics.Debug.SymbolReader/src/project.json
src/libraries/System.Diagnostics.Debug/tests/project.json
src/libraries/System.Threading.Overlapped/src/project.json