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

Linting and Prettify: All files in js/turtleactions #2831

Merged
merged 9 commits into from
Feb 11, 2021

Conversation

daksh4469
Copy link
Member

No description provided.

@daksh4469
Copy link
Member Author

Please review @meganindya.
Thanks.

@daksh4469
Copy link
Member Author

I resolved all the conflicts and fixed the lining error in IntervalsActions.js file.
Can you please review it again? @meganindya
Thanks.

@meganindya
Copy link
Member

It isn't a good practice to merge master branch into feature branch.

@ricknjacky
Copy link
Member

@meganindya there's already a PR pertaining to this, #2813
Please do suggest what do we do now? thanks

@meganindya meganindya merged commit 5406b52 into sugarlabs:master Feb 11, 2021
@daksh4469 daksh4469 deleted the daksh4469-main2 branch February 11, 2021 10:30
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