-
Notifications
You must be signed in to change notification settings - Fork 6
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
Change how system.rs
imports blocks to avoid merge conflicts
#39
base: master
Are you sure you want to change the base?
Change how system.rs
imports blocks to avoid merge conflicts
#39
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@race-of-sloths invite |
@artob Thank you for calling! @imunproductive Thank you for the contribution! Join Race of Sloths by simply mentioning me in your comment/PRs description and start collecting Sloth Points through contributions to open source projects. What is the Race of SlothsRace of Sloths is a friendly competition where you can participate in challenges and compete with other open-source contributors within your normal workflow For contributors:
For maintainers:
Feel free to check our website for additional details! Bot commands
|
This PR fixes potential merge conflicts in other PR's by removing including blocks by name in
system.rs
and usingblock
mod that I implemented.Just doing
would also suffice, but I don't like just including everything.
This seems like a good solution, considering that we will be refactoring the way we include modules soon either way.