Skip to content

Commit

Permalink
fix: bad merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
bombguy authored Nov 29, 2022
1 parent bf7db43 commit cad4606
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
CustomFormCreateNestedJson,
} from './ui-components'; // eslint-disable-line import/extensions, max-len

import { AllSupportedFormFields, Owner, User, Tag, LazyTag, LazyAllSupportedFormFieldsTag } from './models';
import { AllSupportedFormFields, Owner, User, Tag, LazyTag, Student, LazyAllSupportedFormFieldsTag } from './models';

const initializeTestData = async (): Promise<void> => {
await DataStore.save(new User({ firstName: 'John', lastName: 'Lennon', age: 29 }));
Expand Down

0 comments on commit cad4606

Please sign in to comment.