Resolve merge conflicts

2026-10-06 19:28:16 +00:00 · 2023-03-07 11:22:56 +07:00
parent 6abbc1c54d 85e5319981
commit 5b65adedbb
68 changed files with 1028 additions and 446 deletions
@@ -25,6 +25,6 @@
    "jsx": "preserve",
    "incremental": true
  },
-  "include": ["next-env.d.ts", "./src/**/*.ts", "./src/**/*.tsx", "./.eslintrc.js"],
+  "include": ["next-i18next.config.js", "next-env.d.ts", "./src/**/*.ts", "./src/**/*.tsx", "./.eslintrc.js"],
  "exclude": ["node_modules"]
 }