Update CHANGELOG.md [skip ci]

stevensacks · Sep 24, 2021 · b8a4b86 · b8a4b86
1 parent a62e3f4
commit b8a4b86
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# v1.0.6 (Fri Sep 24 2021)
+
+#### ⚠️ Pushed to `main`
+
+- fix(project): resolve merge conflicts ([@stevensacks](https://github.com/stevensacks))
+
+#### Authors: 1
+
+- Steven Sacks ([@stevensacks](https://github.com/stevensacks))
+
+---
+
 # v1.0.5 (Fri Sep 24 2021)
 
 #### 🐛 Bug Fix