summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2020-03-03 14:24:55 -0700
committermo khan <mo.khan@gmail.com>2020-03-03 14:24:55 -0700
commit074b2675d7c592d060b98cebb53bbff6fabc6794 (patch)
tree798e0cc5f156aec1d1f0cf6415399547260449ab
parent4448cd9068b34d348361b78673791917413e06dc (diff)
Fix CHANGELOG
-rw-r--r--CHANGELOG.md1
1 files changed, 0 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 345677e..d1a77a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,6 @@
## v2.5.2
- Exclude development/test dependencies by default (!117)
->>>>>>> origin/master
## v2.5.1