Skip to content

Commit

Permalink
fix: merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
vasco-santos committed Dec 13, 2022
2 parents b4d7efb + 7a50112 commit 51bf234
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"rules": {
"unicorn/prefer-number-properties": "off",
"unicorn/no-null": "off",
"unicorn/no-array-callback-reference": "off",
"unicorn/no-array-for-each": "off",
"unicorn/no-await-expression-member": "off",
"unicorn/prefer-set-has": "off",
Expand Down

0 comments on commit 51bf234

Please # to comment.