From 1a825ac5074750bc20fc1959ee85a6059e21c328 Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Fri, 4 Oct 2019 12:25:31 -0400
Subject: [PATCH] little modification

---
 src/js/popup.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/js/popup.js b/src/js/popup.js
index bdb2b87..f1b97a4 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -745,7 +745,6 @@ Logic.registerPanel(P_CONTAINER_INFO, {
     } catch (e) {
       throw new Error("Could not check for incompatible add-ons.");
     }
-<<<<<<< HEAD
     const moveTabsEl = document.querySelector("#container-info-movetabs");
     const numTabs = await Logic.numTabs();
     if (incompatible) {
@@ -763,8 +762,6 @@ Logic.registerPanel(P_CONTAINER_INFO, {
       });
       window.close();
     });
-=======
->>>>>>> Integrated the proxified-containers.js logic into relevant files without direct proxifying yet
   },
 
   // This method is called when the panel is shown.