Skip to content

Commit

Permalink
Merge pull request #3204 from mirpedrol/editorconfig-lines
Browse files Browse the repository at this point in the history
fix too many empty lines added to .editorconfig file
  • Loading branch information
mirpedrol authored Oct 9, 2024
2 parents 41052dc + 54a4dc5 commit 61dec48
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

- Fixed an issue where the linting CI action didn't read the correct file ([#3202](https://github.com/nf-core/tools/pull/3202))
- Fixed condition for `awsfulltest` to run ([#3203](https://github.com/nf-core/tools/pull/3203))
- Fix too many empty lines added to .editorconfig file ([#3204](https://github.com/nf-core/tools/pull/3204))

## [v3.0.0 - Titanium Tapir](https://github.com/nf-core/tools/releases/tag/3.0.0) - [2024-10-08]

Expand Down
8 changes: 4 additions & 4 deletions nf_core/pipeline-template/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ indent_style = space
[*.{md,yml,yaml,html,css,scss,js}]
indent_size = 2

{% if modules %}
{% if modules -%}
# These files are edited and tested upstream in nf-core/modules
[/modules/nf-core/**]
charset = unset
Expand All @@ -25,12 +25,12 @@ end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
indent_style = unset
{% endif %}
{%- endif %}

{% if email %}
{% if email -%}
[/assets/email*]
indent_size = unset
{% endif %}
{%- endif %}

# ignore python and markdown
[*.{py,md}]
Expand Down

0 comments on commit 61dec48

Please sign in to comment.