Skip to content

Commit 2f6f913

Browse files
AstnAstn
committed
Resolve conflicts
2 parents 993d6e7 + 9cea646 commit 2f6f913

9 files changed

Lines changed: 1082 additions & 1057 deletions

File tree

‎.gitattributes‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto
3+
4+
# Custom for Visual Studio
5+
*.cs diff=csharp
6+
7+
# Standard to msysgit
8+
*.doc diff=astextplain
9+
*.DOC diff=astextplain
10+
*.docx diff=astextplain
11+
*.DOCX diff=astextplain
12+
*.dot diff=astextplain
13+
*.DOT diff=astextplain
14+
*.pdf diff=astextplain
15+
*.PDF diff=astextplain
16+
*.rtf diff=astextplain
17+
*.RTF diff=astextplain

‎AustinHarris.JsonRpc.sln‎

Lines changed: 83 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,83 @@
1-
2-
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.30723.0
5-
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BBFBBA8A-2F75-422C-ACCD-D05A6EF7244C}"
7-
ProjectSection(SolutionItems) = preProject
8-
AustinHarris.JsonRpc.vsmdi = AustinHarris.JsonRpc.vsmdi
9-
Local.testsettings = Local.testsettings
10-
TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
11-
EndProjectSection
12-
EndProject
13-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AustinHarris.JsonRpc", "Json-Rpc\AustinHarris.JsonRpc.csproj", "{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}"
14-
EndProject
15-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AustinHarris.JsonRpc.AspNet", "AustinHarris.JsonRpc.AspNet\AustinHarris.JsonRpc.AspNet.csproj", "{FFFDEBBC-93F5-4A22-9EC5-D86A4A792DBB}"
16-
EndProject
17-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AustinHarris.JsonRpcTest", "AustinHarris.JsonRpcTest\AustinHarris.JsonRpcTest.csproj", "{0A11B164-EA4A-41E7-BBE8-2CD19DB4C1AD}"
18-
EndProject
19-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{4811B06E-0A04-4CD4-9018-FE8295E8BF08}"
20-
ProjectSection(SolutionItems) = preProject
21-
.nuget\NuGet.Config = .nuget\NuGet.Config
22-
.nuget\NuGet.exe = .nuget\NuGet.exe
23-
.nuget\NuGet.targets = .nuget\NuGet.targets
24-
EndProjectSection
25-
EndProject
26-
Global
27-
GlobalSection(SolutionConfigurationPlatforms) = preSolution
28-
Debug|Any CPU = Debug|Any CPU
29-
Debug|ARM = Debug|ARM
30-
Debug|Mixed Platforms = Debug|Mixed Platforms
31-
Debug|x86 = Debug|x86
32-
Release|Any CPU = Release|Any CPU
33-
Release|ARM = Release|ARM
34-
Release|Mixed Platforms = Release|Mixed Platforms
35-
Release|x86 = Release|x86
36-
EndGlobalSection
37-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
38-
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39-
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Debug|Any CPU.Build.0 = Debug|Any CPU
40-
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Debug|ARM.ActiveCfg = Debug|x86
41-
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
42-
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
43-
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Debug|x86.ActiveCfg = Debug|x86
44-
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Debug|x86.Build.0 = Debug|x86
45-
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Release|Any CPU.ActiveCfg = Release|Any CPU
46-
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Release|Any CPU.Build.0 = Release|Any CPU
47-
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Release|ARM.ActiveCfg = Release|x86
48-
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Release|Mixed Platforms.ActiveCfg = Release|x86
49-
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Release|Mixed Platforms.Build.0 = Release|x86
50-
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Release|x86.ActiveCfg = Release|x86
51-
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Release|x86.Build.0 = Release|x86
52-
{FFFDEBBC-93F5-4A22-9EC5-D86A4A792DBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
53-
{FFFDEBBC-93F5-4A22-9EC5-D86A4A792DBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
54-
{FFFDEBBC-93F5-4A22-9EC5-D86A4A792DBB}.Debug|ARM.ActiveCfg = Debug|Any CPU
55-
{FFFDEBBC-93F5-4A22-9EC5-D86A4A792DBB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
56-
{FFFDEBBC-93F5-4A22-9EC5-D86A4A792DBB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
57-
{FFFDEBBC-93F5-4A22-9EC5-D86A4A792DBB}.Debug|x86.ActiveCfg = Debug|Any CPU
58-
{FFFDEBBC-93F5-4A22-9EC5-D86A4A792DBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
59-
{FFFDEBBC-93F5-4A22-9EC5-D86A4A792DBB}.Release|Any CPU.Build.0 = Release|Any CPU
60-
{FFFDEBBC-93F5-4A22-9EC5-D86A4A792DBB}.Release|ARM.ActiveCfg = Release|Any CPU
61-
{FFFDEBBC-93F5-4A22-9EC5-D86A4A792DBB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
62-
{FFFDEBBC-93F5-4A22-9EC5-D86A4A792DBB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
63-
{FFFDEBBC-93F5-4A22-9EC5-D86A4A792DBB}.Release|x86.ActiveCfg = Release|Any CPU
64-
{0A11B164-EA4A-41E7-BBE8-2CD19DB4C1AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
65-
{0A11B164-EA4A-41E7-BBE8-2CD19DB4C1AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
66-
{0A11B164-EA4A-41E7-BBE8-2CD19DB4C1AD}.Debug|ARM.ActiveCfg = Debug|Any CPU
67-
{0A11B164-EA4A-41E7-BBE8-2CD19DB4C1AD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
68-
{0A11B164-EA4A-41E7-BBE8-2CD19DB4C1AD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
69-
{0A11B164-EA4A-41E7-BBE8-2CD19DB4C1AD}.Debug|x86.ActiveCfg = Debug|Any CPU
70-
{0A11B164-EA4A-41E7-BBE8-2CD19DB4C1AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
71-
{0A11B164-EA4A-41E7-BBE8-2CD19DB4C1AD}.Release|Any CPU.Build.0 = Release|Any CPU
72-
{0A11B164-EA4A-41E7-BBE8-2CD19DB4C1AD}.Release|ARM.ActiveCfg = Release|Any CPU
73-
{0A11B164-EA4A-41E7-BBE8-2CD19DB4C1AD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
74-
{0A11B164-EA4A-41E7-BBE8-2CD19DB4C1AD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
75-
{0A11B164-EA4A-41E7-BBE8-2CD19DB4C1AD}.Release|x86.ActiveCfg = Release|Any CPU
76-
EndGlobalSection
77-
GlobalSection(SolutionProperties) = preSolution
78-
HideSolutionNode = FALSE
79-
EndGlobalSection
80-
GlobalSection(TestCaseManagementSettings) = postSolution
81-
CategoryFile = AustinHarris.JsonRpc.vsmdi
82-
EndGlobalSection
83-
EndGlobal
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 2013
4+
VisualStudioVersion = 12.0.30723.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BBFBBA8A-2F75-422C-ACCD-D05A6EF7244C}"
7+
ProjectSection(SolutionItems) = preProject
8+
AustinHarris.JsonRpc.vsmdi = AustinHarris.JsonRpc.vsmdi
9+
Local.testsettings = Local.testsettings
10+
TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
11+
EndProjectSection
12+
EndProject
13+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AustinHarris.JsonRpc", "Json-Rpc\AustinHarris.JsonRpc.csproj", "{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}"
14+
EndProject
15+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AustinHarris.JsonRpc.AspNet", "AustinHarris.JsonRpc.AspNet\AustinHarris.JsonRpc.AspNet.csproj", "{FFFDEBBC-93F5-4A22-9EC5-D86A4A792DBB}"
16+
EndProject
17+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AustinHarris.JsonRpcTest", "AustinHarris.JsonRpcTest\AustinHarris.JsonRpcTest.csproj", "{0A11B164-EA4A-41E7-BBE8-2CD19DB4C1AD}"
18+
EndProject
19+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{4811B06E-0A04-4CD4-9018-FE8295E8BF08}"
20+
ProjectSection(SolutionItems) = preProject
21+
.nuget\NuGet.Config = .nuget\NuGet.Config
22+
.nuget\NuGet.exe = .nuget\NuGet.exe
23+
.nuget\NuGet.targets = .nuget\NuGet.targets
24+
EndProjectSection
25+
EndProject
26+
Global
27+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
28+
Debug|Any CPU = Debug|Any CPU
29+
Debug|ARM = Debug|ARM
30+
Debug|Mixed Platforms = Debug|Mixed Platforms
31+
Debug|x86 = Debug|x86
32+
Release|Any CPU = Release|Any CPU
33+
Release|ARM = Release|ARM
34+
Release|Mixed Platforms = Release|Mixed Platforms
35+
Release|x86 = Release|x86
36+
EndGlobalSection
37+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
38+
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39+
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Debug|Any CPU.Build.0 = Debug|Any CPU
40+
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Debug|ARM.ActiveCfg = Debug|x86
41+
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
42+
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
43+
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Debug|x86.ActiveCfg = Debug|x86
44+
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Debug|x86.Build.0 = Debug|x86
45+
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Release|Any CPU.ActiveCfg = Release|Any CPU
46+
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Release|Any CPU.Build.0 = Release|Any CPU
47+
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Release|ARM.ActiveCfg = Release|x86
48+
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Release|Mixed Platforms.ActiveCfg = Release|x86
49+
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Release|Mixed Platforms.Build.0 = Release|x86
50+
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Release|x86.ActiveCfg = Release|x86
51+
{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Release|x86.Build.0 = Release|x86
52+
{FFFDEBBC-93F5-4A22-9EC5-D86A4A792DBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
53+
{FFFDEBBC-93F5-4A22-9EC5-D86A4A792DBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
54+
{FFFDEBBC-93F5-4A22-9EC5-D86A4A792DBB}.Debug|ARM.ActiveCfg = Debug|Any CPU
55+
{FFFDEBBC-93F5-4A22-9EC5-D86A4A792DBB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
56+
{FFFDEBBC-93F5-4A22-9EC5-D86A4A792DBB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
57+
{FFFDEBBC-93F5-4A22-9EC5-D86A4A792DBB}.Debug|x86.ActiveCfg = Debug|Any CPU
58+
{FFFDEBBC-93F5-4A22-9EC5-D86A4A792DBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
59+
{FFFDEBBC-93F5-4A22-9EC5-D86A4A792DBB}.Release|Any CPU.Build.0 = Release|Any CPU
60+
{FFFDEBBC-93F5-4A22-9EC5-D86A4A792DBB}.Release|ARM.ActiveCfg = Release|Any CPU
61+
{FFFDEBBC-93F5-4A22-9EC5-D86A4A792DBB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
62+
{FFFDEBBC-93F5-4A22-9EC5-D86A4A792DBB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
63+
{FFFDEBBC-93F5-4A22-9EC5-D86A4A792DBB}.Release|x86.ActiveCfg = Release|Any CPU
64+
{0A11B164-EA4A-41E7-BBE8-2CD19DB4C1AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
65+
{0A11B164-EA4A-41E7-BBE8-2CD19DB4C1AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
66+
{0A11B164-EA4A-41E7-BBE8-2CD19DB4C1AD}.Debug|ARM.ActiveCfg = Debug|Any CPU
67+
{0A11B164-EA4A-41E7-BBE8-2CD19DB4C1AD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
68+
{0A11B164-EA4A-41E7-BBE8-2CD19DB4C1AD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
69+
{0A11B164-EA4A-41E7-BBE8-2CD19DB4C1AD}.Debug|x86.ActiveCfg = Debug|Any CPU
70+
{0A11B164-EA4A-41E7-BBE8-2CD19DB4C1AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
71+
{0A11B164-EA4A-41E7-BBE8-2CD19DB4C1AD}.Release|Any CPU.Build.0 = Release|Any CPU
72+
{0A11B164-EA4A-41E7-BBE8-2CD19DB4C1AD}.Release|ARM.ActiveCfg = Release|Any CPU
73+
{0A11B164-EA4A-41E7-BBE8-2CD19DB4C1AD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
74+
{0A11B164-EA4A-41E7-BBE8-2CD19DB4C1AD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
75+
{0A11B164-EA4A-41E7-BBE8-2CD19DB4C1AD}.Release|x86.ActiveCfg = Release|Any CPU
76+
EndGlobalSection
77+
GlobalSection(SolutionProperties) = preSolution
78+
HideSolutionNode = FALSE
79+
EndGlobalSection
80+
GlobalSection(TestCaseManagementSettings) = postSolution
81+
CategoryFile = AustinHarris.JsonRpc.vsmdi
82+
EndGlobalSection
83+
EndGlobal

0 commit comments

Comments
 (0)