fix bad merge

Author: Tom Laird-McConnell

libraries/botbuilder/src/botFrameworkAdapter.ts

@@ -7,11 +7,10 @@
  */
 
 import { Activity, ActivityTypes, BotAdapter, ChannelAccount, ConversationAccount, ConversationParameters, ConversationReference, ConversationsResult, ResourceResponse, TurnContext } from 'botbuilder-core';
-import { ChannelValidation, ConnectorClient, JwtTokenValidation, MicrosoftAppCredentials, TokenApiClient, TokenApiModels, SimpleCredentialProvider, EmulatorApiClient } from 'botframework-connector';
+import { ChannelValidation, ConnectorClient, EmulatorApiClient, GovernmentConstants, JwtTokenValidation, MicrosoftAppCredentials, SimpleCredentialProvider, TokenApiClient, TokenApiModels } from 'botframework-connector';
 import * as os from 'os';
 
 
-
 /**
  * Express or Restify Request object.
  */