Skip to content

Commit 9b1d30b

Browse files
AstnAstn
committed
fixed some problems with the merge
1 parent 9f4e427 commit 9b1d30b

4 files changed

Lines changed: 2 additions & 33 deletions

File tree

‎AustinHarris.JsonRpcTestN/AustinHarris.JsonRpcTestN.csproj‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
2-
<?xml version="1.0" encoding="utf-8"?>
3-
=======
41
<?xml version="1.0" encoding="utf-8"?>
5-
>>>>>>> c0a6d05741c6197a3ffaccbe2ee414b049d7d7d1
62
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
73
<PropertyGroup>
84
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,11 +8,8 @@
128
<RootNamespace>AustinHarris.JsonRpcTestN</RootNamespace>
139
<AssemblyName>AustinHarris.JsonRpcTestN</AssemblyName>
1410
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
15-
<<<<<<< HEAD
1611
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1712
<RestorePackages>true</RestorePackages>
18-
=======
19-
>>>>>>> c0a6d05741c6197a3ffaccbe2ee414b049d7d7d1
2013
</PropertyGroup>
2114
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2215
<DebugSymbols>true</DebugSymbols>
@@ -37,7 +30,6 @@
3730
<ConsolePause>false</ConsolePause>
3831
</PropertyGroup>
3932
<ItemGroup>
40-
<<<<<<< HEAD
4133
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
4234
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
4335
<Private>True</Private>
@@ -47,15 +39,6 @@
4739
<Private>True</Private>
4840
</Reference>
4941
<Reference Include="System" />
50-
=======
51-
<Reference Include="System" />
52-
<Reference Include="Newtonsoft.Json">
53-
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
54-
</Reference>
55-
<Reference Include="nunit.framework">
56-
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
57-
</Reference>
58-
>>>>>>> c0a6d05741c6197a3ffaccbe2ee414b049d7d7d1
5942
</ItemGroup>
6043
<ItemGroup>
6144
<Compile Include="Test.cs" />
@@ -71,7 +54,6 @@
7154
<Name>AustinHarris.JsonRpc</Name>
7255
</ProjectReference>
7356
</ItemGroup>
74-
<<<<<<< HEAD
7557
<ItemGroup>
7658
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
7759
</ItemGroup>
@@ -82,6 +64,4 @@
8264
</PropertyGroup>
8365
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
8466
</Target>
85-
=======
86-
>>>>>>> c0a6d05741c6197a3ffaccbe2ee414b049d7d7d1
8767
</Project>

‎AustinHarris.JsonRpcTestN/Test.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
namespace AustinHarris.JsonRpcTestN
99
{
10-
<<<<<<< HEAD
1110
public class Poco
1211
{
1312
public static Poco WithOffset(int offset)
@@ -25,8 +24,6 @@ public Poco(int offset)
2524
public int Add(int input) { return input + _offset; }
2625
}
2726

28-
=======
29-
>>>>>>> c0a6d05741c6197a3ffaccbe2ee414b049d7d7d1
3027
[TestFixture ()]
3128
public class Test
3229
{
@@ -42,7 +39,6 @@ static Test()
4239
new CalculatorService()};
4340
}
4441

45-
<<<<<<< HEAD
4642
[Test()]
4743
public void TestCanCreateMultipleServicesOfSameTypeInTheirOwnSessions()
4844
{
@@ -64,8 +60,6 @@ public void TestCanCreateMultipleServicesOfSameTypeInTheirOwnSessions()
6460
}
6561
}
6662

67-
=======
68-
>>>>>>> c0a6d05741c6197a3ffaccbe2ee414b049d7d7d1
6963
[Test ()]
7064
public void TestCanCreateAndRemoveSession()
7165
{

‎Json-Rpc/AustinHarris.JsonRpc.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net40\Newtonsoft.Json.dll</HintPath>
7676
<Private>True</Private>
7777
</Reference>
78+
<Reference Include="System" />
7879
</ItemGroup>
7980
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
8081
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
@@ -94,4 +95,4 @@
9495
<ItemGroup>
9596
<None Include="packages.config" />
9697
</ItemGroup>
97-
</Project>
98+
</Project>

‎TestServer_Console/TestServer_Console.csproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,11 @@
8484
<Target Name="AfterBuild">
8585
</Target>
8686
-->
87-
<<<<<<< HEAD
8887
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
8988
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
9089
<PropertyGroup>
9190
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
9291
</PropertyGroup>
9392
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
9493
</Target>
95-
=======
96-
<ItemGroup>
97-
<None Include="packages.config" />
98-
</ItemGroup>
99-
>>>>>>> c0a6d05741c6197a3ffaccbe2ee414b049d7d7d1
10094
</Project>

0 commit comments

Comments
 (0)