fix: fix merge conflict

gfmio · gfmio · commit b5002483e030 · 2019-03-11T16:53:58.000Z
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",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "example-calculator",`
`3`		`- "version": "0.5.3",`
	`3`	`+ "version": "0.5.4",`
`4`	`4`	`"description": "A simple calculator package developed as an exemplary, educational project using a range of libraries and external tools",`
`5`	`5`	`"author": "Frédérique Mittelstaedt <git@gfm.io> (www.gfm.io)",`
`6`	`6`	`"license": "MIT",`