Resolve conflicts

youtube · Jun 30, 2024 · b9890de · b9890de
1 parent 29cb342
commit b9890de
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/cobalt/BUILD.gn b/cobalt/BUILD.gn
@@ -72,17 +72,10 @@ group("default") {
     if (sb_is_evergreen) {
       deps += [
         # TODO(b/294247612): Remove unnecessary dependencies.
-<<<<<<< HEAD
         "//cobalt/updater",
-        "//cobalt/updater:crash_sandbox",
-        "//cobalt/updater:noop_sandbox",
-        "//cobalt/updater:one_app_only_sandbox",
-=======
-        "//chrome/updater",
-        "//chrome/updater:crash_sandbox_install",
-        "//chrome/updater:noop_sandbox_install",
-        "//chrome/updater:one_app_only_sandbox_install",
->>>>>>> e31b739e229 (Fix missing build targets for Evergreen (#3724))
+        "//cobalt/updater:crash_sandbox_install",
+        "//cobalt/updater:noop_sandbox_install",
+        "//cobalt/updater:one_app_only_sandbox_install",
         "//components/client_update_protocol",
         "//components/crx_file",
         "//components/prefs",