resolve conflicts

Expensify · Jul 18, 2022 · 8b8137e · 8b8137e
2 parents c994c8d + 13d2766
commit 8b8137e
Show file tree

Hide file tree

Showing 55 changed files with 613 additions and 632 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,7 +1,7 @@
 module.exports = {
     extends: ['expensify', 'plugin:storybook/recommended'],
     parser: 'babel-eslint',
-    ignorePatterns: ['!.*', 'src/vendor', '.github/actions/**/index.js'],
+    ignorePatterns: ['!.*', 'src/vendor', '.github/actions/**/index.js', 'desktop/dist/*.js', 'dist/*.js'],
     env: {
         jest: true,
     },