Skip to content

Commit

Permalink
Fix various merge messes
Browse files Browse the repository at this point in the history
  • Loading branch information
danieljohnson2 committed May 12, 2024
1 parent 795d67c commit 898a7f3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lutris/game.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from gettext import gettext as _
from typing import cast

from gi.repository import Gio, GLib, GObject, Gtk
from gi.repository import Gio, GLib, Gtk

from lutris import settings
from lutris.config import LutrisConfig
Expand Down
2 changes: 1 addition & 1 deletion lutris/gui/lutriswindow.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from lutris.database import games as games_db
from lutris.database.services import ServiceGameCollection
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.addgameswindow import AddGamesWindow
from lutris.gui.config.preferences_dialog import PreferencesDialog
Expand Down

0 comments on commit 898a7f3

Please sign in to comment.