From f54b6afc02677d3a36355cbe5b8a20723a60bb4a Mon Sep 17 00:00:00 2001 From: Anton Dudakov Date: Tue, 15 Jul 2025 10:38:52 +0200 Subject: [PATCH] fixes merge conflicts --- src/_locales | 2 +- src/js/background/backgroundLogic.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/_locales b/src/_locales index 4f5188f..7ae3edd 160000 --- a/src/_locales +++ b/src/_locales @@ -1 +1 @@ -Subproject commit 4f5188f3ba55916db3d74345abbbe651e2e8be78 +Subproject commit 7ae3edd7455fd776a25a1017c0dfac26b21d7950 diff --git a/src/js/background/backgroundLogic.js b/src/js/background/backgroundLogic.js index f2ff7d3..7816412 100644 --- a/src/js/background/backgroundLogic.js +++ b/src/js/background/backgroundLogic.js @@ -76,6 +76,8 @@ const backgroundLogic = { browser.commands.reset("sort_tabs"); } } + } + }, async reopenInContainer(cookieStoreId) { const currentTab = await browser.tabs.query({ active: true, currentWindow: true })