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
View File
@@ -425,6 +425,8 @@
<Compile Include="Clients\RepositoryPagesClient.cs" />
<Compile Include="Models\Response\Page.cs" />
<Compile Include="Models\Response\PagesBuild.cs" />
<Compile Include="Models\Response\RepositoryStar.cs" />
<Compile Include="Models\Response\UserStar.cs" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
</Project>