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

feat: add cooling seats #994

Merged
merged 25 commits into from
Jun 9, 2024
Merged

feat: add cooling seats #994

merged 25 commits into from
Jun 9, 2024

Conversation

dandelionclock
Copy link
Contributor

@dandelionclock dandelionclock commented Jun 8, 2024

Bug reports are welcome because I cannot test extensively without a car with cooled seats.

Issue 977

@alandtse
Copy link
Owner

alandtse commented Jun 8, 2024

Please handle merge conflicts.

@alandtse
Copy link
Owner

alandtse commented Jun 9, 2024

So the way to handle merge conflicts is to pull in dev. You can typically do this by git pull --rebase. Manually making changes like you did doesn't really work well.

@alandtse alandtse changed the title feat: cooling seats feat: add cooling seats Jun 9, 2024
@alandtse alandtse merged commit 66fb89e into alandtse:main Jun 9, 2024
7 checks passed
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