Fix various merge messes

This commit is contained in:
Daniel Johnson 2024-05-12 07:17:49 -04:00 committed by Mathieu Comandon
parent 5c32bacf71
commit 075b531080

View file

@ -21,7 +21,7 @@ from lutris.database import categories as categories_db
from lutris.database import games as games_db from lutris.database import games as games_db
from lutris.database.services import ServiceGameCollection from lutris.database.services import ServiceGameCollection
from lutris.exceptions import EsyncLimitError from lutris.exceptions import EsyncLimitError
from lutris.game import GAME_INSTALLED, GAME_STOPPED, GAME_UNHANDLED_ERROR, GAME_UPDATED, Game, GameSearch from lutris.game import GAME_INSTALLED, GAME_STOPPED, GAME_UNHANDLED_ERROR, GAME_UPDATED, Game
from lutris.gui import dialogs from lutris.gui import dialogs
from lutris.gui.addgameswindow import AddGamesWindow from lutris.gui.addgameswindow import AddGamesWindow
from lutris.gui.config.preferences_dialog import PreferencesDialog from lutris.gui.config.preferences_dialog import PreferencesDialog