resolving merge conflict

Virtual-Josh · Virtual-Josh · commit 566d80afb0ed · 2020-02-12T10:55:33.000-08:00
diff --git a/libraries/botbuilder-core/botbuilder/core/teams/teams_info.py b/libraries/botbuilder-core/botbuilder/core/teams/teams_info.py
@@ -1,8 +1,13 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
+<<<<<<< HEAD
 from typing import List, Tuple
 from botbuilder.schema import ConversationParameters, ConversationReference
+=======
+from typing import List
+from botbuilder.schema import ConversationParameters
+>>>>>>> 9f1901c313c763fb6ab6dbc884625d6fceac83f0
 from botbuilder.core.turn_context import Activity, TurnContext
 from botbuilder.schema.teams import (
     ChannelInfo,
@@ -18,7 +23,11 @@ class TeamsInfo:
     @staticmethod
     async def send_message_to_teams_channel(
         turn_context: TurnContext, activity: Activity, teams_channel_id: str
+<<<<<<< HEAD
     ) -> Tuple[ConversationReference, str]:
+=======
+    ) -> tuple:
+>>>>>>> 9f1901c313c763fb6ab6dbc884625d6fceac83f0
         if not turn_context:
             raise ValueError("The turn_context cannot be None")
         if not turn_context.activity:
@@ -39,9 +48,13 @@ async def send_message_to_teams_channel(
         return (result[0], result[1])
 
     @staticmethod
+<<<<<<< HEAD
     async def _create_conversation_callback(
         new_turn_context,
     ) -> Tuple[ConversationReference, str]:
+=======
+    async def _create_conversation_callback(new_turn_context) -> tuple:
+>>>>>>> 9f1901c313c763fb6ab6dbc884625d6fceac83f0
         new_activity_id = new_turn_context.activity.id
         conversation_reference = TurnContext.get_conversation_reference(
             new_turn_context.activity
