fix: fix merge conflict

gfmio · Mar 11, 2019 · b500248 · b500248
2 parents 8f18a97 + f1c1589
commit b500248
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [0.5.4](https://github.com/gfmio/example-calculator/compare/v0.5.3...v0.5.4) (2019-03-11)
+
+### Reverts
+
+- "chore(readme.md): sample addition" ([e791103](https://github.com/gfmio/example-calculator/commit/e791103))
+
 ## [0.5.3](https://github.com/gfmio/example-calculator/compare/v0.5.2...v0.5.3) (2019-03-11)
 
 ### Reverts

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-calculator",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "A simple calculator package developed as an exemplary, educational project using a range of libraries and external tools",
   "author": "Frédérique Mittelstaedt <git@gfm.io> (www.gfm.io)",
   "license": "MIT",