merge conflicts

[arvados-workbench2.git] / src / views-components / dialog-create / dialog-project-create.tsx

diff --git a/src/views-components/dialog-create/dialog-project-create.tsx b/src/views-components/dialog-create/dialog-project-create.tsx
index 6fb8a699df64e01f35dc5a60a49c35063cd827ff..34c655e2b9922ff9da8c338cac14e59785795c32 100644 (file)
--- a/src/views-components/dialog-create/dialog-project-create.tsx
+++ b/src/views-components/dialog-create/dialog-project-create.tsx
@@ -125,4 +125,4 @@ const styles: StyleRulesCallback<CssRules> = theme => ({
 export default compose(
     reduxForm({ form: 'projectCreateDialog' }),
     withStyles(styles)
 export default compose(
     reduxForm({ form: 'projectCreateDialog' }),
     withStyles(styles)

-)(DialogProjectCreate);
\ No newline at end of file
+)(DialogProjectCreate);