rebase

guillaumecrespel · guillaumecrespel · commit 1b1e948b2cb7 · 2017-08-09T13:48:21.000+02:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kriya",
-  "version": "2.0.0-rc4",
+  "version": "2.0.0",
   "main": "index.js",
   "description": "Kriya is a react/redux components library",
   "license": "MIT",
diff --git a/src/button/button.styles.scss b/src/button/button.styles.scss
@@ -108,8 +108,3 @@
 .iconRight {
   color: inherit;
 }
-
-.iconLeft,
-.iconRight {
-  color: inherit;
-}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "kriya",`
`3`		`- "version": "2.0.0-rc4",`
	`3`	`+ "version": "2.0.0",`
`4`	`4`	`"main": "index.js",`
`5`	`5`	`"description": "Kriya is a react/redux components library",`
`6`	`6`	`"license": "MIT",`