zoriya/octokit.net
1
0
Fork 0
mirror of https://github.com/zoriya/octokit.net.git synced 2026-06-09 13:01:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflicts

Browse Source
This commit is contained in:
Brendan Forster
2015-01-28 09:27:41 +09:30
parent b8bb2a8277
commit 0e609d7b9e
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Octokit/Octokit-MonoAndroid.csproj
-3
View File
@@ -369,15 +369,12 @@
<Compile Include="Models\Response\CommitContent.cs" />
<Compile Include="Models\Response\SignatureResponse.cs" />
<Compile Include="Helpers\PropertyOrField.cs" />
<<<<<<< HEAD
<Compile Include="Helpers\ApiUrls.Authorizations.cs" />
<Compile Include="Models\Response\ApplicationAuthorization.cs" />
=======
<Compile Include="Models\Response\SearchResult.cs" />
<Compile Include="Http\Response.cs" />
<Compile Include="Models\Response\PublicKey.cs" />
<Compile Include="Models\Request\GistFileUpdate.cs" />
>>>>>>> master
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
</Project>
Octokit/Octokit-Monotouch.csproj
-3
View File
@@ -364,15 +364,12 @@
<Compile Include="Models\Response\CommitContent.cs" />
<Compile Include="Models\Response\SignatureResponse.cs" />
<Compile Include="Helpers\PropertyOrField.cs" />
<<<<<<< HEAD
<Compile Include="Helpers\ApiUrls.Authorizations.cs" />
<Compile Include="Models\Response\ApplicationAuthorization.cs" />
=======
<Compile Include="Models\Response\SearchResult.cs" />
<Compile Include="Http\Response.cs" />
<Compile Include="Models\Response\PublicKey.cs" />
<Compile Include="Models\Request\GistFileUpdate.cs" />
>>>>>>> master
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />