fixes rebase issues

This commit is contained in:
psychedelicious
2023-02-07 21:15:33 +11:00
committed by blessedcoolant
parent 5478d2a15e
commit 2b7752b72e
4 changed files with 2 additions and 38 deletions

View File

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

View File

@@ -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;