Update BUILD.gn

youtube · May 18, 2024 · 4230fab · 4230fab
1 parent e08ae33
commit 4230fab
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/cobalt/h5vcc/BUILD.gn b/cobalt/h5vcc/BUILD.gn
@@ -19,13 +19,11 @@ config("h5vcc_internal_config") {
 
 config("h5vcc_external_config") {
   defines = []
-<<<<<<< HEAD
   if (enable_account_manager) {
     defines += [ "COBALT_ENABLE_ACCOUNT_MANAGER" ]
-=======
+  }
   if (enable_extended_ifa_in_h5vcc) {
     defines += [ "COBALT_ENABLE_EXTENDED_IFA" ]
->>>>>>> 6653e2f63fe (Add extended IFA support to H5vccSystem (#3292))
   }
 }