chore: fix merge conflicts

openedx · Sep 10, 2024 · af89cf3 · af89cf3
2 parents b0a47cc + 6255768
commit af89cf3
Show file tree

Hide file tree

Showing 80 changed files with 1,409 additions and 788 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -12,6 +12,8 @@ module.exports = createConfig(
       'template-curly-spacing': 'off',
       'react-hooks/exhaustive-deps': 'off',
       'no-restricted-exports': 'off',
+      // There is no reason to disallow this syntax anymore; we don't use regenerator-runtime in new browsers
+      'no-restricted-syntax': 'off',
     },
     settings: {
       // Import URLs should be resolved using aliases