Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed Audrey and amixer code for issue #330. #619

Merged
merged 4 commits into from
Sep 26, 2016

Conversation

pmatis
Copy link
Contributor

@pmatis pmatis commented Sep 18, 2016

Another fix that was forgotten about for 3 years. Sorry...

@@ -727,9 +727,16 @@ sub new {
if ( lc $paz_type eq 'amixer' ) {

#Headphone:0:L
<<<<<<< HEAD
Copy link
Owner

@hollie hollie Sep 18, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There seems to be a remaining merge conflict here. Can you please review it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for catching that. Fixed..

@hollie hollie added this to the MisterHouse v4.2 milestone Sep 26, 2016
@hollie hollie merged commit b98828f into hollie:master Sep 26, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants