fix merge conflicts

This commit is contained in:
Mordechai Zuber
2016-01-25 14:08:37 +02:00
18 changed files with 396 additions and 7 deletions
+2 -2
View File
@@ -32,7 +32,7 @@ namespace Octokit
/// See the <a href="https://developer.github.com/v3/repos/pages/#list-pages-builds">API documentation</a> for more information.
/// </remarks>
/// <returns></returns>
Task<IReadOnlyList<PagesBuild>> GetAllBuilds(string owner, string repositoryName);
Task<IReadOnlyList<PagesBuild>> GetAll(string owner, string repositoryName);
/// <summary>
/// Gets the build metadata for the last build for a given repository
/// </summary>
@@ -42,6 +42,6 @@ namespace Octokit
/// See the <a href="https://developer.github.com/v3/repos/pages/#list-latest-pages-build">API documentation</a> for more information.
/// </remarks>
/// <returns></returns>
Task<PagesBuild> GetLatestBuild(string owner, string repositoryName);
Task<PagesBuild> GetLatest(string owner, string repositoryName);
}
}