fix(Button): conflicts resolved

asadmogul · asadmogul · commit 1dbf734de7f4 · 2019-05-06T19:49:09.000+05:00
diff --git a/src/components/Button/styles.ts b/src/components/Button/styles.ts
@@ -4,7 +4,7 @@ import { Theme as MuiTheme } from '@material-ui/core';
 import { fade } from '@material-ui/core/styles/colorManipulator';
 
 export const styles = ({ color, disabled }: ButtonProps, muiTheme: MuiTheme, theme: Theme) => {
-	if (!color || (color === 'default' && !disabled)) {
+	if (!color || color === 'default' && !disabled) {
 		return;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import { Theme as MuiTheme } from '@material-ui/core';`
`4`	`4`	`import { fade } from '@material-ui/core/styles/colorManipulator';`
`5`	`5`
`6`	`6`	`export const styles = ({ color, disabled }: ButtonProps, muiTheme: MuiTheme, theme: Theme) => {`
`7`		`- if (!color \|\| (color === 'default' && !disabled)) {`
	`7`	`+ if (!color \|\| color === 'default' && !disabled) {`
`8`	`8`	`return;`
`9`	`9`	`}`
`10`	`10`