fixes rebase issues

invokeai/frontend/.eslintrc.cjs

@@ -1,13 +0,0 @@
-module.exports = {
-  extends: [
-    'eslint:recommended',
-    'plugin:@typescript-eslint/recommended',
-    'plugin:react-hooks/recommended',
-  ],
-  parser: '@typescript-eslint/parser',
-  plugins: ['@typescript-eslint', 'eslint-plugin-react-hooks'],
-  root: true,
-  rules: {
-    '@typescript-eslint/no-unused-vars': ['warn', { varsIgnorePattern: '_+' }],
-  },
-};

invokeai/frontend/eslintconfig.json

@@ -1,23 +0,0 @@
-{
-  "eslintConfig": {
-    "extends": [
-      "eslint:recommended",
-      "plugin:@typescript-eslint/recommended",
-      "plugin:react-hooks/recommended"
-    ],
-    "parser": "@typescript-eslint/parser",
-    "plugins": ["@typescript-eslint", "eslint-plugin-react-hooks"],
-    "root": true,
-    "settings": {
-      "import/resolver": {
-        "node": {
-          "paths": ["src"],
-          "extensions": [".js", ".jsx", ".ts", ".tsx"]
-        }
-      }
-    },
-    "rules": {
-      "react/jsx-filename-extension": [1, { "extensions": [".tsx", ".ts"] }]
-    }
-  }
-}

invokeai/frontend/src/features/parameters/components/MainParameters/MainSampler.tsx

@@ -26,7 +26,7 @@ export default function MainSampler() {
       validValues={
         activeModel.format === 'diffusers' ? DIFFUSERS_SAMPLERS : SAMPLERS
       }
-      styleClass="main-option-block"
+      styleClass="main-settings-block"
     />
   );
 }

invokeai/frontend/src/features/parameters/store/generationSlice.ts

@@ -1,9 +1,9 @@
 import type { PayloadAction } from '@reduxjs/toolkit';
 import { createSlice } from '@reduxjs/toolkit';
 import * as InvokeAI from 'app/invokeai';
+import { getPromptAndNegative } from 'common/util/getPromptAndNegative';
 import promptToString from 'common/util/promptToString';
 import { seedWeightsToString } from 'common/util/seedWeightPairs';
-import { getPromptAndNegative } from 'common/util/getPromptAndNegative';
 
 export interface GenerationState {
   cfgScale: number;