Skip to content

Commit

Permalink
Resolve merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
BartoszGrajdek committed Dec 15, 2023
1 parent 866ef5c commit d63f975
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions src/types/onyx/PersonalDetails.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,7 @@ type PersonalDetails = {
status?: string;
};

<<<<<<< HEAD
type PersonalDetailsList = Record<string, PersonalDetails | null>;
=======
type PersonalDetailsList = Record<string, PersonalDetails>;
>>>>>>> origin/main

export default PersonalDetails;

Expand Down

0 comments on commit d63f975

Please sign in to comment.