conflict fix

hakobyansen · Jan 20, 2019 · 2712924 · 2712924
2 parents 0a24f89 + 80a70be
commit 2712924
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/version.json b/version.json
@@ -1 +1 @@
-{"major":0,"minor":1,"patch":3}
+{"major":0,"minor":1,"patch":4}
diff --git a/versionlog.md b/versionlog.md
@@ -46,5 +46,11 @@
 ## 0.0.2 2018-09-12
 * Response class created.
 
+## 0.1.3 2018-09-19
+* Refactoring.
+* Documentation updated.
+
+## 0.1.4
+
 ## 0.0.1 2018-09-12
 * Initial commit.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"major":0,"minor":1,"patch":3}
		{"major":0,"minor":1,"patch":4}