Removing Commented out Button Code

brave · Jul 6, 2021 · 5df5996 · 5df5996
1 parent f89e4c6
commit 5df5996
Showing 1 changed file with 12 additions and 18 deletions.
diff --git 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()
+                })
         }
     }