From 3350cf49db293aa26c10d70f3af37c4f6506de97 Mon Sep 17 00:00:00 2001
From: Soner Yuksel <grkmyksl@gmail.com>
Date: Tue, 6 Jul 2021 12:43:16 -0400
Subject: [PATCH] Removing Commented out Button Code

---
 .../BrowserViewController+Menu.swift          | 30 ++++++++-----------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/Client/Frontend/Browser/BrowserViewController/BrowserViewController+Menu.swift b/Client/Frontend/Browser/BrowserViewController/BrowserViewController+Menu.swift
index db87e9b974a..1ef79b67795 100644
--- a/Client/Frontend/Browser/BrowserViewController/BrowserViewController+Menu.swift
+++ b/Client/Frontend/Browser/BrowserViewController/BrowserViewController+Menu.swift
@@ -11,24 +11,18 @@ import Shared
 extension BrowserViewController {
     func featuresMenuSection(_ menuController: MenuViewController) -> some View {
         VStack(spacing: 0) {
-//<<<<<<< HEAD
-//            VPNMenuButton(vpnProductInfo: self.vpnProductInfo) { vc in
-//                (self.presentedViewController as? MenuViewController)?
-//                    .pushInnerMenu(vc)
-//            }
-//=======
-            VPNMenuButton(vpnProductInfo: self.vpnProductInfo,
-                          displayVPNDestination: { vc in
-                            (self.presentedViewController as? MenuViewController)?
-                                .pushInnerMenu(vc)
-                          },
-                          enableInstalledVPN: { [unowned menuController] in
-                            /// Donate Enable VPN Activity for suggestions
-                            let enableVPNActivity = ActivityShortcutManager.shared.createShortcutActivity(type: .enableBraveVPN)
-                            menuController.userActivity = enableVPNActivity
-                            enableVPNActivity.becomeCurrent()
-                          })
-//>>>>>>> 5225e8a6d (Fixing Merge conflicts and adjustment menu options action using new menu UI)
+            VPNMenuButton(
+                vpnProductInfo: self.vpnProductInfo,
+                displayVPNDestination: { vc in
+                    (self.presentedViewController as? MenuViewController)?
+                        .pushInnerMenu(vc)
+                },
+                enableInstalledVPN: { [unowned menuController] in
+                    /// Donate Enable VPN Activity for suggestions
+                    let enableVPNActivity = ActivityShortcutManager.shared.createShortcutActivity(type: .enableBraveVPN)
+                    menuController.userActivity = enableVPNActivity
+                    enableVPNActivity.becomeCurrent()
+                })
         }
     }