Skip to content
This repository has been archived by the owner. It is now read-only.

Update trident-master.json #24

Merged
merged 2 commits into from Feb 4, 2019
Merged

Update trident-master.json #24

merged 2 commits into from Feb 4, 2019

Conversation

Reviewers

@beanpole135 beanpole135

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
@RodMyers @beanpole135
@RodMyers
Copy link
Collaborator

@RodMyers RodMyers commented Jan 30, 2019

added

"www_palemoon_UNSET="ALSA PULSEAUDIO",

to see if palemoon builds

log file file stated;

=======================<phase: check-sanity >============================
====> Two or more enabled options conflict with each other
=====> Option SNDIO conflicts with ALSA PULSEAUDIO (select only one)
*** Error code 1
Rod Myers and others added 2 commits Jan 30, 2019
Update trident-master.json
5134cde 
to see if palemoon builds

log file file stated;

=======================<phase: check-sanity   >============================
====> Two or more enabled options conflict with each other
=====> Option SNDIO conflicts with ALSA PULSEAUDIO (select only one)
*** Error code 1
@beanpole135
Update trident-master.json
8cbf996 
Fix a syntax error in a PR: one too many quotes.
beanpole135
beanpole135 approved these changes Feb 4, 2019
View changes
Copy link
Member

@beanpole135 beanpole135 left a comment

Ok, I just commited a quick fix for a syntax error, but other than that it looks fine!

@beanpole135 beanpole135 merged commit 76578e1 into master Feb 4, 2019
@beanpole135 beanpole135 deleted the RodMyers-patch-3 branch Feb 4, 2019
@beanpole135
Copy link
Member

@beanpole135 beanpole135 commented Feb 4, 2019

Thanks for sending that in!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.