Update BUILD.gn

youtube · Aug 27, 2024 · 2208d72 · 2208d72
1 parent 563f80c
commit 2208d72
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/starboard/stub/BUILD.gn b/starboard/stub/BUILD.gn
@@ -117,12 +117,7 @@ static_library("stub_sources") {
     "//starboard/shared/stub/media_get_video_buffer_budget.cc",
     "//starboard/shared/stub/media_is_buffer_pool_allocate_on_demand.cc",
     "//starboard/shared/stub/media_is_buffer_using_memory_pool.cc",
-<<<<<<< HEAD
-    "//starboard/shared/stub/media_is_supported.cc",
-    "//starboard/shared/stub/media_is_video_supported.cc",
     "//starboard/shared/stub/media_set_audio_write_duration.cc",
-=======
->>>>>>> 08cef068d14 (Add media_support_internal to media_util gn target (#4047))
     "//starboard/shared/stub/memory_allocate_aligned_unchecked.cc",
     "//starboard/shared/stub/memory_allocate_unchecked.cc",
     "//starboard/shared/stub/memory_flush.cc",