Resolved conflicts

This commit is contained in:
Prayank Mathur
2016-04-11 09:57:03 +05:30
parent a9fcefab99
commit 33d237a90d
2 changed files with 1 additions and 1 deletions
@@ -109,6 +109,7 @@ public class RepositoryPagesClientTests
_repositoryPagesClient = Helper.GetAuthenticatedClient().Repository.Page;
}
[IntegrationTest]
public async Task ReturnsMetadata()
{
var data = _repositoryPagesClient.GetLatest(owner, name);
@@ -138,7 +138,6 @@
<Compile Include="Reactive\Enterprise\ObservableEnterpriseLicenseClientTests.cs" />
<Compile Include="Reactive\Enterprise\ObservableEnterpriseSearchIndexingClientTests.cs" />
<Compile Include="Reactive\Enterprise\ObservableEnterpriseOrganizationClientTests.cs" />
<Compile Include="Reactive\ObservableRepositoryDeployKeysClientTests.cs" />
<Compile Include="Reactive\ObservableAssigneesClientTests.cs" />
<Compile Include="Reactive\ObservableAuthorizationsClientTests.cs" />
<Compile Include="Reactive\ObservableEventsClientTests.cs" />