|
8 | 8 |
|
9 | 9 | ### Modules |
10 | 10 |
|
| 11 | +<<<<<<< HEAD |
11 | 12 | - feat(1929): Make local modules use remote structure ([#3256](https://github.com/nf-core/tools/pull/3256)) |
12 | 13 |
|
| 14 | +======= |
| 15 | +>>>>>>> cb7c0d7b (fix: Update to latest CHANGELOG) |
13 | 16 | ### Subworkflows |
14 | 17 |
|
15 | 18 | ### General |
|
96 | 99 | ### Modules |
97 | 100 |
|
98 | 101 | - 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)) |
100 | 102 |
|
101 | 103 | ### Subworkflows |
102 | 104 |
|
| 105 | +<<<<<<< HEAD |
103 | 106 | <<<<<<< HEAD |
104 | 107 | - Add `nf-core subworkflows patch` command ([#2861](https://github.com/nf-core/tools/pull/2861)) |
105 | 108 | - Improve subworkflow nf-test migration warning ([#3298](https://github.com/nf-core/tools/pull/3298)) |
106 | 109 | ======= |
107 | 110 | - Subworkflows created in pipelines "local" dir now use the full template ([#3256](https://github.com/nf-core/tools/pull/3256)) |
108 | 111 | >>>>>>> 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) |
109 | 116 |
|
110 | 117 | ### General |
111 | 118 |
|
|
116 | 123 | - Update GitHub Actions ([#3237](https://github.com/nf-core/tools/pull/3237)) |
117 | 124 | - add `--dir/-d` option to schema commands ([#3247](https://github.com/nf-core/tools/pull/3247)) |
118 | 125 | <<<<<<< HEAD |
| 126 | +<<<<<<< HEAD |
| 127 | +======= |
| 128 | +>>>>>>> cb7c0d7b (fix: Update to latest CHANGELOG) |
119 | 129 | - fix headers in api docs ([#3323](https://github.com/nf-core/tools/pull/3323)) |
120 | 130 | - handle new schema structure in `nf-core pipelines create-params-file` ([#3276](https://github.com/nf-core/tools/pull/3276)) |
121 | 131 | - Update Gitpod image to use Miniforge instead of Miniconda([#3274](https://github.com/nf-core/tools/pull/3274)) |
|
138 | 148 | - Update codecov/codecov-action action to v5 ([#3283](https://github.com/nf-core/tools/pull/3283)) |
139 | 149 | - Update gitpod/workspace-base Docker digest to 12853f7 ([#3309](https://github.com/nf-core/tools/pull/3309)) |
140 | 150 | - Update pre-commit hook astral-sh/ruff-pre-commit to v0.8.2 ([#3325](https://github.com/nf-core/tools/pull/3325)) |
| 151 | +<<<<<<< HEAD |
141 | 152 | ======= |
142 | 153 | - Update pre-commit hook astral-sh/ruff-pre-commit to v0.7.1 ([#3250](https://github.com/nf-core/tools/pull/3250)) |
143 | 154 | >>>>>>> 31cffdd5 (feat(1929): allow missing files when linting local modules) |
| 155 | +======= |
| 156 | +>>>>>>> cb7c0d7b (fix: Update to latest CHANGELOG) |
144 | 157 |
|
145 | 158 | ## [v3.0.2 - Titanium Tapir Patch](https://github.com/nf-core/tools/releases/tag/3.0.2) - [2024-10-11] |
146 | 159 |
|
|
0 commit comments