From 224f4ac2296fc6e03d0f6ac30a64facd29968393 Mon Sep 17 00:00:00 2001
From: wuggy <ownedbywuigi@gmail.com>
Date: Thu, 23 Apr 2026 22:21:46 -0700
Subject: [PATCH] Fix merge-conflict markers in moz.build (whoops)

---
 media/ffvpx/libavcodec/moz.build | 4 ----
 media/ffvpx/libavutil/moz.build  | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/media/ffvpx/libavcodec/moz.build b/media/ffvpx/libavcodec/moz.build
index 35f85474d1..5d85b64cf2 100644
--- a/media/ffvpx/libavcodec/moz.build
+++ b/media/ffvpx/libavcodec/moz.build
@@ -8,16 +8,12 @@
 if CONFIG['FFVPX_ASFLAGS']:
     DIRS += ['x86']
 
-<<<<<<< HEAD
-#    'dummy_funcs.c',
-=======
 if CONFIG['CPU_ARCH'] == 'aarch64':
     DIRS += ['aarch64']
 elif CONFIG['CPU_ARCH'].startswith('ppc'):
     DIRS += ['ppc']
 elif CONFIG['CPU_ARCH'].startswith('loongarch64'):
     DIRS += ['loongarch']
->>>>>>> fb438829b5 (MoonchildProductions/UXP#2897: Fix ffvpx build on loongarch64)
 
 SharedLibrary('mozavcodec')
 SOURCES += [
diff --git a/media/ffvpx/libavutil/moz.build b/media/ffvpx/libavutil/moz.build
index b383ed66e1..c33dbce89d 100644
--- a/media/ffvpx/libavutil/moz.build
+++ b/media/ffvpx/libavutil/moz.build
@@ -6,9 +6,6 @@
 # Due to duplicate file names, we compile libavutil/x86 in its own
 # moz.build file.
 if CONFIG['FFVPX_ASFLAGS']:
-<<<<<<< HEAD
-    DIRS += ['x86']
-=======
     if CONFIG['CPU_ARCH'].startswith('x86'):
         DIRS += ['x86']
     elif CONFIG['CPU_ARCH'].startswith('arm'):
@@ -20,7 +17,6 @@ elif CONFIG['CPU_ARCH'].startswith('ppc'):
     DIRS += ['ppc']
 elif CONFIG['CPU_ARCH'].startswith('loongarch64'):
     DIRS += ['loongarch']
->>>>>>> fb438829b5 (MoonchildProductions/UXP#2897: Fix ffvpx build on loongarch64)
 
 SharedLibrary('mozavutil')