Merge branch 'master' into dev

This commit is contained in:
Karl Burtram
2016-11-28 09:58:32 -08:00
12 changed files with 994 additions and 6 deletions

View File

@@ -397,7 +397,7 @@ namespace Microsoft.SqlTools.ServiceLayer
[System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class Keys
{
static ResourceManager resourceManager = new ResourceManager("Microsoft.SqlTools.ServiceLayer.SR", typeof(SR).GetTypeInfo().Assembly);
static ResourceManager resourceManager = new ResourceManager(typeof(SR));
static CultureInfo _culture = null;