Merge stable to develop #2351
Merged
Merge stable to develop #2351
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Make python-flake8.yml a general lint workflow * Add a lint check to prevent crlf endings in git * Set text=auto and renormalize files * Add a lint check to prevent whitespace issues Whitespace issues as understood by git (by default) are trailing whitespace at EOL, whitespace on an otherwise empty line, a space character immediately followed by a tab character in the indentation of a line, and multiple newlines at EOF. References: - https://git-scm.com/docs/git-diff#Documentation/git-diff.txt---check - https://peter.eisentraut.org/blog/2014/11/04/checking-whitespace-with-git * Fix trailing whitespace issues * Fix issues with multiple newlines at EOF * Ignore conflict marker warning in rst files
ReimarBauer
commented
May 13, 2024
| @@ -51,6 +51,8 @@ As **Beginner** start with an installation of Miniforge3 | |||
|
|
|||
| If you use already Mambaforge please read the `FAQ <https://github.com/conda-forge/miniforge#faq>`__ | |||
|
|
|||
|
|
|||
There was a problem hiding this comment.
removed the arm osx section
joernu76
approved these changes
May 14, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose of PR?:
merges changes from stable to develop