Fix merge conflicts

2026-10-14 07:30:20 +00:00 · 2023-07-21 14:37:13 +07:00
parent 241dceb845 af650ef4c7
commit 5ee65359bf
136 changed files with 5831 additions and 16909 deletions
@@ -10,7 +10,6 @@
    "plugin:@typescript-eslint/recommended"
  ],
  "rules": {
-    "@typescript-eslint/no-empty-function": "off",
    "no-console": 2,
    "quotes": [
      "error",
@@ -34,11 +33,6 @@
        "argsIgnorePattern": "^_"
      }
    ],
-    "sort-imports": [
-      "error",
-      {
-        "ignoreDeclarationSort": true
-      }
-    ]
+    "sort-imports": 1
  }
 }