[Resolved Conlfict] Merge origin next to local.

This commit is contained in:
Qolzam
2018-04-04 10:37:03 +07:00
14 changed files with 21 additions and 8418 deletions

View File

@@ -131,4 +131,4 @@ const mapStateToProps = (state: Map<string, any>, ownProps: IImgComponentProps)
}
// - Connect component to redux store
export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ImgComponent as any)as any)
export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles as any)(ImgComponent as any)as any)