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.

Sign up for GitHub

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

Jump to bottom

fix(hg): make os check a string, fix git conflict mess #433

Merged
merged 1 commit into from
Aug 1, 2024
Merged

fix(hg): make os check a string, fix git conflict mess #433

merged 1 commit into from
Aug 1, 2024

Conversation

JacobCoffee
Copy link
Member

Description

  • Fixes OS check for list vs string
  • Fixes bad git conflict stomping due to me being not smart and using the GitHub UI thinking it was good but in fact is bad

@JacobCoffee JacobCoffee requested a review from ewdurbin as a code owner August 1, 2024 20:39
@JacobCoffee JacobCoffee enabled auto-merge (squash) August 1, 2024 20:40
@JacobCoffee JacobCoffee merged commit d572bb6 into main Aug 1, 2024
1 of 2 checks passed
@JacobCoffee JacobCoffee deleted the fix-hg- branch August 1, 2024 20:40
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 1, 2024

Don't forget to pull the latest changes on salt.nyc1.psf.io!

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

@ewdurbin ewdurbin Awaiting requested review from ewdurbin ewdurbin is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@JacobCoffee