fixes merge conflicts

antondudakov · antondudakov · commit f54b6afc0267 · 2025-07-15T10:38:52.000+02:00
diff --git 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
@@ -76,6 +76,8 @@ const backgroundLogic = {
           browser.commands.reset("sort_tabs");
         }
       }
+    }
+  },
 
   async reopenInContainer(cookieStoreId) {
    const currentTab = await browser.tabs.query({ active: true, currentWindow: true })

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,8 @@ const backgroundLogic = {`
`76`	`76`	`browser.commands.reset("sort_tabs");`
`77`	`77`	`}`
`78`	`78`	`}`
	`79`	`+ }`
	`80`	`+ },`
`79`	`81`
`80`	`82`	`async reopenInContainer(cookieStoreId) {`
`81`	`83`	`const currentTab = await browser.tabs.query({ active: true, currentWindow: true })`