Merge pull request #2208 from wtgodbe/prTestRun
authorWilliam Godbe <wigodbe@microsoft.com>
Wed, 2 Dec 2015 21:25:41 +0000 (13:25 -0800)
committerWilliam Godbe <wigodbe@microsoft.com>
Wed, 2 Dec 2015 21:25:41 +0000 (13:25 -0800)
commit94bd37b625fffe29e1e346421a444d41c30bb3a9
tree440a9e4f626f2205e5a4b44294c73825c268e5d5
parent9a6ac81289733f8622ff3cb2f88447d9cd7ef4db
parent1ff81b4b2b574bad704e484e57a7e09bc1a633e5
Merge pull request #2208 from wtgodbe/prTestRun

resolved naming conflict