Skip to content
This repository was archived by the owner on Sep 1, 2025. It is now read-only.

Conversation

jingai
Copy link
Collaborator

@jingai jingai commented Aug 10, 2016

Has Alexa speak the currently playing movie, show, or album/artist/song.

@m0ngr31
Copy link
Owner

m0ngr31 commented Sep 28, 2016

There is just a nagging conflict. I added a bunch of stuff I'd been working on last night so if you could fix the conflict, that'd be great.

@jingai
Copy link
Collaborator Author

jingai commented Sep 28, 2016

I will fix the conflict this week. Thanks for merging the other PRs :)

@m0ngr31
Copy link
Owner

m0ngr31 commented Sep 28, 2016

Sorry it took me so long!

@jingai jingai force-pushed the currentplayiteminquiry branch 2 times, most recently from c04eb6b to b5ee4ef Compare September 29, 2016 14:18
@jingai
Copy link
Collaborator Author

jingai commented Sep 29, 2016

Rebased and resolved conflicts.

@m0ngr31
Copy link
Owner

m0ngr31 commented Oct 1, 2016

I broke it again with your other PR!

@jingai
Copy link
Collaborator Author

jingai commented Oct 1, 2016

lol give me 1 min and I'll fix

Has Alexa speak the currently playing movie, show, or album/artist/song.
@jingai jingai force-pushed the currentplayiteminquiry branch from b5ee4ef to c991c0a Compare October 1, 2016 03:34
@jingai
Copy link
Collaborator Author

jingai commented Oct 1, 2016

Rebased. Sorry, should be clean now!

@m0ngr31 m0ngr31 merged commit a562f55 into m0ngr31:master Oct 1, 2016
@jingai jingai deleted the currentplayiteminquiry branch October 1, 2016 04:03
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants