resolve merge conflicts

This commit is contained in:
Lincoln Stein
2023-08-20 15:26:52 -04:00
105 changed files with 473 additions and 453 deletions

View File

@ -54,7 +54,6 @@ from invokeai.frontend.install.widgets import (
MultiSelectColumns,
CenteredButtonPress,
FileBox,
IntTitleSlider,
set_min_terminal_size,
CyclingForm,
MIN_COLS,
@ -318,7 +317,7 @@ class editOptsForm(CyclingForm, npyscreen.FormMultiPage):
first_time = not (config.root_path / "invokeai.yaml").exists()
access_token = HfFolder.get_token()
window_width, window_height = get_terminal_size()
label = """Configure startup settings. You can come back and change these later.
label = """Configure startup settings. You can come back and change these later.
Use ctrl-N and ctrl-P to move to the <N>ext and <P>revious fields.
Use cursor arrows to make a checkbox selection, and space to toggle.
"""