fixed serializer conflicts

david-driscoll · david-driscoll · commit 3b245d0ee6fc · 2018-06-25T20:57:13.000-04:00
diff --git a/src/Client/LanguageClient.cs b/src/Client/LanguageClient.cs
@@ -14,6 +14,7 @@
 using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities;
 using ISerializer = OmniSharp.Extensions.LanguageServer.Protocol.Serialization.ISerializer;
+using Serializer = OmniSharp.Extensions.LanguageServer.Protocol.Serialization.Serializer;
 
 namespace OmniSharp.Extensions.LanguageServer.Client
 {
diff --git a/src/Client/Protocol/LspConnection.cs b/src/Client/Protocol/LspConnection.cs
@@ -16,6 +16,7 @@
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;
 using JsonRpcMessages = OmniSharp.Extensions.JsonRpc.Server.Messages;
+using Serializer = OmniSharp.Extensions.LanguageServer.Protocol.Serialization.Serializer;
 
 namespace OmniSharp.Extensions.LanguageServer.Client.Protocol
 {

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;`
`15`	`15`	`using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities;`
`16`	`16`	`using ISerializer = OmniSharp.Extensions.LanguageServer.Protocol.Serialization.ISerializer;`
	`17`	`+using Serializer = OmniSharp.Extensions.LanguageServer.Protocol.Serialization.Serializer;`
`17`	`18`
`18`	`19`	`namespace OmniSharp.Extensions.LanguageServer.Client`
`19`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;`
`17`	`17`	`using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;`
`18`	`18`	`using JsonRpcMessages = OmniSharp.Extensions.JsonRpc.Server.Messages;`
	`19`	`+using Serializer = OmniSharp.Extensions.LanguageServer.Protocol.Serialization.Serializer;`
`19`	`20`
`20`	`21`	`namespace OmniSharp.Extensions.LanguageServer.Client.Protocol`
`21`	`22`	`{`