diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-07-21 12:26:27 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-07-21 12:26:27 -0800 |
| commit | 848eeeeef4ed277ceb00d3fc6c8a0303c0e72d09 (patch) | |
| tree | 98390442e8052b8e02469e5ccf7596e22b7ea07f /web/react/pages/signup_team_complete.jsx | |
| parent | e87adce4a059b97a65198b326be6304abdf4e657 (diff) | |
| parent | bee26e3f2654ce7acce647818847480569236343 (diff) | |
| download | chat-848eeeeef4ed277ceb00d3fc6c8a0303c0e72d09.tar.gz chat-848eeeeef4ed277ceb00d3fc6c8a0303c0e72d09.tar.bz2 chat-848eeeeef4ed277ceb00d3fc6c8a0303c0e72d09.zip | |
fixing merge conflicts
Diffstat (limited to 'web/react/pages/signup_team_complete.jsx')
| -rw-r--r-- | web/react/pages/signup_team_complete.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/pages/signup_team_complete.jsx b/web/react/pages/signup_team_complete.jsx index c17cbdfac..346f2ab5a 100644 --- a/web/react/pages/signup_team_complete.jsx +++ b/web/react/pages/signup_team_complete.jsx @@ -5,7 +5,7 @@ var SignupTeamComplete =require('../components/signup_team_complete.jsx'); global.window.setup_signup_team_complete_page = function(email, name, data, hash) { React.render( - <SignupTeamComplete name={name} email={email} hash={hash} data={data} />, + <SignupTeamComplete name={name} email={email} hash={hash} data={data}/>, document.getElementById('signup-team-complete') ); -};
\ No newline at end of file +}; |