Skip to content

Commit

Permalink
Revert merge conflict resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
sebelga committed Jan 29, 2020
1 parent 86cc635 commit 63eb9a9
Showing 1 changed file with 2 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,8 @@ export const MappingsState = React.memo(
: Promise.resolve(true);

const templatesFormValidator =
state.templates.submitForm !== undefined
? new Promise(async resolve => {
const { isValid } = await state.templates.submitForm!();
resolve(isValid);
})
state.templates.form !== undefined
? (await state.templates.form!.submit()).isValid
: Promise.resolve(true);

const promisesToValidate = [configurationFormValidator, templatesFormValidator];
Expand Down

0 comments on commit 63eb9a9

Please sign in to comment.