Skip to content

Commit

Permalink
fix: cleanup merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
nzambello committed Mar 23, 2023
1 parent ebde83b commit 90248db
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ CSVReader.propTypes = {
inputId: PropTypes.string,
inputName: PropTypes.string,
inputStyle: PropTypes.object,
inputRef: PropTypes.oneOfType([PropTypes.func, PropTypes.exact({ current: PropTypes.any })]),
label: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
onError: PropTypes.func,
onFileLoaded: PropTypes.func.isRequired,
Expand Down

0 comments on commit 90248db

Please sign in to comment.