Skip to content

Commit

Permalink
merge conflict in changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
@sloloris
sloloris committed Sep 29, 2020
2 parents ee4abc3 + ead4135 commit 913494a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## [Unreleased]
## [1.5.0] (September 29, 2020)

FEATURES:

Expand Down

0 comments on commit 913494a

Please sign in to comment.