fix(conflicts): conflicts

godxiaoji · Sep 28, 2020 · 70139b9 · 70139b9
2 parents bdd9c11 + 7e86626
commit 70139b9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## [0.1.2](https://github.com/godxiaoji/colorfuls/compare/v0.1.1...v0.1.2) (2020-09-28)
+
+
+### Bug Fixes
+
+* **gradient:** support ie10 ([ff25fb4](https://github.com/godxiaoji/colorfuls/commit/ff25fb41dd9af9165b547871313bb6eb62d6d2fc))
+* **test:** browser test ([cdfb0f8](https://github.com/godxiaoji/colorfuls/commit/cdfb0f8a404873b2e02c48c06a4eee90d7c34a60))
+
 ## [0.1.1](https://github.com/godxiaoji/colorfuls/compare/v0.1.0...v0.1.1) (2020-09-27)
 
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "colorfuls",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "A small Javascript library for color conversion and manipulation. Also provides color mixin and gradient.",
   "main": "dist/colorfuls.js",
   "scripts": {