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

🔀 Backmerge Main #244

Merged
merged 12 commits into from
Dec 23, 2024
Merged

🔀 Backmerge Main #244

merged 12 commits into from
Dec 23, 2024

Conversation

AndrewLuGit
Copy link
Contributor

No description provided.

BennyBot and others added 12 commits April 20, 2023 19:33
* ✨ Add a button to reset the PROS conductor file (#224)

* pros c reset button

Works

* fix prettier warning

automated CI run of prettier is bugged

* run prettier on new file

please pass ci check

* Allow conductor reset regardless of vscode context

Co-authored-by: BennyBot <[email protected]>

* Add package.json entry for resetConductor

---------

Co-authored-by: BennyBot <[email protected]>

* 🐛 Use tag versions to select CLI version on welcome screen (#225)

Co-authored-by: Andrew Lu <[email protected]>

* update package.json

---------

Co-authored-by: Jack Hughes <[email protected]>
Co-authored-by: BennyBot <[email protected]>
Copy link
Member

@Rocky14683 Rocky14683 left a comment

Choose a reason for hiding this comment

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

LGTM

@AndrewLuGit AndrewLuGit merged commit c6e1a11 into develop Dec 23, 2024
3 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.

3 participants