From 675379d1f33e51a34b1cf87c00c02a2dda67fc00 Mon Sep 17 00:00:00 2001 From: catarak Date: Wed, 8 Jun 2016 20:52:59 -0400 Subject: [PATCH] sign up view renders, not tested if functional --- shared/containers/SignupView/SignupView.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/shared/containers/SignupView/SignupView.jsx b/shared/containers/SignupView/SignupView.jsx index e1f92f90..8467ee92 100644 --- a/shared/containers/SignupView/SignupView.jsx +++ b/shared/containers/SignupView/SignupView.jsx @@ -1,4 +1,5 @@ import React from 'react' +<<<<<<< HEAD import { bindActionCreators } from 'redux' import { connect } from 'react-redux' import * as UserActions from '../../redux/actions/user'