resolve changelog conflict

emmarousseau · Mar 24, 2024 · 152ea42 · 152ea42
1 parent a0b4e2e
commit 152ea42
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,8 @@
 
 * `star/star_align_reads`: Align reads to a reference genome (PR #22).
 
+* `gffread`: Validate, filter, convert and perform other operations on GFF files (PR #29). 
+
 * `samtools`:
     - `samtools/flagstat`: Counts the number of alignments in SAM/BAM/CRAM files for each FLAG type (PR #30).