sign up view renders, not tested if functional

2016-06-08 20:52:59 -04:00 · 2016-06-08 20:52:59 -04:00 · 675379d1f3
commit 675379d1f3
parent 99c9506081
1 changed files with 1 additions and 0 deletions
--- 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'