Skip to content

Commit 662df94

Browse files
committed
Fix merge mistake in Clinical-Genomics#25
1 parent 3df2b22 commit 662df94

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

.nf-core.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,12 @@ lint:
77
- conf/igenomes.config
88
- conf/igenomes_ignored.config
99
files_unchanged:
10-
- .github/CONTRIBUTING.md
11-
- .github/workflows/linting.yml
12-
- .github/ISSUE_TEMPLATE/config.yml
1310
- .github/ISSUE_TEMPLATE/bug_report.yml
1411
- .github/ISSUE_TEMPLATE/feature_request.yml
1512
- .github/PULL_REQUEST_TEMPLATE.md
13+
- .github/workflows/linting.yml
1614
- .prettierignore
1715
- assets/sendmail_template.txt
18-
- assets/nf-core-oncorefiner_logo_light.png
19-
- docs/images/nf-core-oncorefiner_logo_light.png
20-
- docs/images/nf-core-oncorefiner_logo_dark.png
2116
- docs/README.md
2217
multiqc_config: false
2318
nf_core_version: 3.5.2

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ Initial release of Clinical-Genomics/oncorefiner, created with the [nf-core](htt
3939
- Updated template for nf-core/tools version 3.5.2 to apply updated settings and changes missed in previous template update ([14](https://github.com/Clinical-Genomics/oncorefiner/pull/14)) [#35](https://github.com/Clinical-Genomics/oncorefiner/pull/35)
4040
- Fixed prepare_references config that was defined but not used [36](https://github.com/Clinical-Genomics/oncorefiner/pull/36)
4141
- Fixed bug and formatting in feature request template [#39](https://github.com/Clinical-Genomics/oncorefiner/pull/39)
42+
- Fixed merge mistake introduced in [#25](https://github.com/Clinical-Genomics/oncorefiner/pull/25) [#41](https://github.com/Clinical-Genomics/oncorefiner/pull/41)
4243

4344
### `Dependencies`
4445

0 commit comments

Comments
 (0)