Skip to content

Commit 5689ff6

Browse files
committed
fix: Update to latest CHANGELOG
1 parent 5d1d44b commit 5689ff6

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

CHANGELOG.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@
88

99
### Modules
1010

11+
<<<<<<< HEAD
1112
- feat(1929): Make local modules use remote structure ([#3256](https://github.com/nf-core/tools/pull/3256))
1213

14+
=======
15+
>>>>>>> cb7c0d7b (fix: Update to latest CHANGELOG)
1316
### Subworkflows
1417

1518
### General
@@ -96,16 +99,20 @@
9699
### Modules
97100

98101
- add a panel around diff previews when updating ([#3246](https://github.com/nf-core/tools/pull/3246))
99-
- Modules created in pipelines "local" dir now use the full template ([#3256](https://github.com/nf-core/tools/pull/3256))
100102

101103
### Subworkflows
102104

105+
<<<<<<< HEAD
103106
<<<<<<< HEAD
104107
- Add `nf-core subworkflows patch` command ([#2861](https://github.com/nf-core/tools/pull/2861))
105108
- Improve subworkflow nf-test migration warning ([#3298](https://github.com/nf-core/tools/pull/3298))
106109
=======
107110
- Subworkflows created in pipelines "local" dir now use the full template ([#3256](https://github.com/nf-core/tools/pull/3256))
108111
>>>>>>> 31cffdd5 (feat(1929): allow missing files when linting local modules)
112+
=======
113+
- Add `nf-core subworkflows patch` command ([#2861](https://github.com/nf-core/tools/pull/2861))
114+
- Improve subworkflow nf-test migration warning ([#3298](https://github.com/nf-core/tools/pull/3298))
115+
>>>>>>> cb7c0d7b (fix: Update to latest CHANGELOG)
109116
110117
### General
111118

@@ -116,6 +123,9 @@
116123
- Update GitHub Actions ([#3237](https://github.com/nf-core/tools/pull/3237))
117124
- add `--dir/-d` option to schema commands ([#3247](https://github.com/nf-core/tools/pull/3247))
118125
<<<<<<< HEAD
126+
<<<<<<< HEAD
127+
=======
128+
>>>>>>> cb7c0d7b (fix: Update to latest CHANGELOG)
119129
- fix headers in api docs ([#3323](https://github.com/nf-core/tools/pull/3323))
120130
- handle new schema structure in `nf-core pipelines create-params-file` ([#3276](https://github.com/nf-core/tools/pull/3276))
121131
- Update Gitpod image to use Miniforge instead of Miniconda([#3274](https://github.com/nf-core/tools/pull/3274))
@@ -138,9 +148,12 @@
138148
- Update codecov/codecov-action action to v5 ([#3283](https://github.com/nf-core/tools/pull/3283))
139149
- Update gitpod/workspace-base Docker digest to 12853f7 ([#3309](https://github.com/nf-core/tools/pull/3309))
140150
- Update pre-commit hook astral-sh/ruff-pre-commit to v0.8.2 ([#3325](https://github.com/nf-core/tools/pull/3325))
151+
<<<<<<< HEAD
141152
=======
142153
- Update pre-commit hook astral-sh/ruff-pre-commit to v0.7.1 ([#3250](https://github.com/nf-core/tools/pull/3250))
143154
>>>>>>> 31cffdd5 (feat(1929): allow missing files when linting local modules)
155+
=======
156+
>>>>>>> cb7c0d7b (fix: Update to latest CHANGELOG)
144157
145158
## [v3.0.2 - Titanium Tapir Patch](https://github.com/nf-core/tools/releases/tag/3.0.2) - [2024-10-11]
146159

0 commit comments

Comments
 (0)