-
Notifications
You must be signed in to change notification settings - Fork 1
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
Publish changes from develop #145
Conversation
@Stanislaw-bnk please resolve conflicts as well as pre-commit. |
@Stanislaw-bnk you will not see merge conflicts locally only when you trying to merge. It seems to me that some massive formatting of menus.toml was introduced to your changes, and now there is a big merge conflict. |
@Asiderr Could you please help resolve this merge conflict? I am not sure how to fix it. |
@Stanislaw-bnk, you have to rebase those changes on top of the most recent one, then ask @gosiastyba for confirmation for this PR. |
@gosiastyba Could you please confirm that these changes in ToS from this PR are valid? Then we will merge from develop to main. |
@gosiastyba ping |
Signed-off-by: Artur Raglis <[email protected]>
No description provided.