From b9890deb529c793d46e7f30ed970dbfbfc4629b1 Mon Sep 17 00:00:00 2001 From: Kaido Kert Date: Sat, 29 Jun 2024 18:46:44 -0700 Subject: [PATCH] Resolve conflicts --- cobalt/BUILD.gn | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/cobalt/BUILD.gn b/cobalt/BUILD.gn index 6fc6aeb0a179..667aad1c73aa 100644 --- 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",