From ea58461c60b831e17a48e191838539704a566749 Mon Sep 17 00:00:00 2001 From: Janos Wortmann Date: Thu, 25 Apr 2024 11:15:39 +0200 Subject: [PATCH] Resolve more merge conflicts --- plugin/core/sessions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/core/sessions.py b/plugin/core/sessions.py index 06b88648c..7879ddacf 100644 --- a/plugin/core/sessions.py +++ b/plugin/core/sessions.py @@ -1857,7 +1857,7 @@ def _get_view_state_actions(self, uri: DocumentUri, auto_save: str) -> int: actions |= ViewStateActions.Save return actions - def _set_view_state(self, actions: int, view: Optional[sublime.View]) -> None: + def _set_view_state(self, actions: int, view: sublime.View | None) -> None: if not view: return should_save = bool(actions & ViewStateActions.Save)