diff --git a/Alexa.NET/ResponseBuilder.cs b/Alexa.NET/ResponseBuilder.cs index 9484d7c..dd3d70a 100644 --- a/Alexa.NET/ResponseBuilder.cs +++ b/Alexa.NET/ResponseBuilder.cs @@ -66,9 +66,7 @@ public static SkillResponse Ask(IOutputSpeech speechResponse, Reprompt reprompt, } #endregion -<<<<<<< HEAD - #region Main Response Builder -======= + #region AudioPlayer Response public static SkillResponse AudioPlayerPlay(PlayBehavior playBehavior, string url, string token) { return AudioPlayerPlay(playBehavior, url, token, 0); @@ -99,8 +97,9 @@ public static SkillResponse AudioPlayerPlay(PlayBehavior playBehavior, string ur return response; } - ->>>>>>> ae95467958bfda07a461a775c761d832bf5b2d44 + #endregion + + #region Main Response Builder private static SkillResponse BuildResponse(IOutputSpeech outputSpeech, bool shouldEndSession, Session sessionAttributes, Reprompt reprompt, ICard card) { SkillResponse response = new Response.SkillResponse();