From c1e6d1e6bddd749a288bf8deaf2a95bb772c61f5 Mon Sep 17 00:00:00 2001
From: Josh Sullivan <jaysche.sullivan@gmail.com>
Date: Tue, 12 Nov 2013 00:44:46 -0500
Subject: [PATCH] Patched up some issues from the upstream merge.

Removed default parameter from pull request merge message according to
CA1026.
---
 Octokit/Models/Request/MergePullRequest.cs  | 2 +-
 Octokit/Models/Response/PullRequestMerge.cs | 2 +-
 Octokit/Octokit-Mono.csproj                 | 1 +
 Octokit/Octokit-netcore45.csproj            | 2 ++
 Octokit/Octokit.csproj                      | 2 ++
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Octokit/Models/Request/MergePullRequest.cs b/Octokit/Models/Request/MergePullRequest.cs
index 992c29c0..d59e04ad 100644
--- a/Octokit/Models/Request/MergePullRequest.cs
+++ b/Octokit/Models/Request/MergePullRequest.cs
@@ -7,7 +7,7 @@ namespace Octokit
     /// </summary>
     public class MergePullRequest
     {
-        public MergePullRequest(string message = "")
+        public MergePullRequest(string message)
         {
             Ensure.ArgumentNotNull(message, "message");
 
diff --git a/Octokit/Models/Response/PullRequestMerge.cs b/Octokit/Models/Response/PullRequestMerge.cs
index 475ad974..f46b2739 100644
--- a/Octokit/Models/Response/PullRequestMerge.cs
+++ b/Octokit/Models/Response/PullRequestMerge.cs
@@ -7,7 +7,7 @@ namespace Octokit
         /// <summary>
         /// The sha reference of the commit.
         /// </summary>
-        public string sha { get; set; }
+        public string Sha { get; set; }
 
         /// <summary>
         /// True if merged successfully, otherwise false.
diff --git a/Octokit/Octokit-Mono.csproj b/Octokit/Octokit-Mono.csproj
index 70cd4fd0..6fb14223 100644
--- a/Octokit/Octokit-Mono.csproj
+++ b/Octokit/Octokit-Mono.csproj
@@ -135,6 +135,7 @@
     <Compile Include="Models\Request\RepositoryIssueRequest.cs" />
     <Compile Include="Models\Request\MilestoneRequest.cs" />
     <Compile Include="Models\Response\Reference.cs" />
+    <Compile Include="Models\Response\PullRequestMerge.cs" />
     <Compile Include="Models\Response\Signature.cs" />
     <Compile Include="Models\Response\Subscription.cs" />
     <Compile Include="Models\Response\TagObject.cs" />
diff --git a/Octokit/Octokit-netcore45.csproj b/Octokit/Octokit-netcore45.csproj
index 4b21fbed..c2469a5d 100644
--- a/Octokit/Octokit-netcore45.csproj
+++ b/Octokit/Octokit-netcore45.csproj
@@ -165,6 +165,7 @@
     <Compile Include="Models\Request\IssueRequest.cs" />
     <Compile Include="Models\Request\IssueUpdate.cs" />
     <Compile Include="Models\Request\LabelUpdate.cs" />
+    <Compile Include="Models\Request\MergePullRequest.cs" />
     <Compile Include="Models\Request\MilestoneRequest.cs" />
     <Compile Include="Models\Request\MilestoneUpdate.cs" />
     <Compile Include="Models\Request\NewAuthorization.cs" />
@@ -222,6 +223,7 @@
     <Compile Include="Models\Response\Organization.cs" />
     <Compile Include="Models\Response\Plan.cs" />
     <Compile Include="Models\Response\PullRequest.cs" />
+    <Compile Include="Models\Response\PullRequestMerge.cs" />
     <Compile Include="Models\Response\Readme.cs" />
     <Compile Include="Models\Response\ReadmeResponse.cs" />
     <Compile Include="Models\Response\Reference.cs" />
diff --git a/Octokit/Octokit.csproj b/Octokit/Octokit.csproj
index 92f2a2a2..dfe288c5 100644
--- a/Octokit/Octokit.csproj
+++ b/Octokit/Octokit.csproj
@@ -155,6 +155,8 @@
     <Compile Include="Models\Response\GistFile.cs" />
     <Compile Include="Models\Response\GistFork.cs" />
     <Compile Include="Models\Response\GistHistory.cs" />
+    <Compile Include="Models\Response\PullRequestMerge.cs" />
+    <Compile Include="Models\Response\TeamItem.cs" />
     <Compile Include="Models\Response\Team.cs" />
     <Compile Include="Models\Response\EventInfo.cs" />
     <Compile Include="Models\Response\GitReference.cs" />