Fix merge-conflict markers in moz.build (whoops)

This commit is contained in:
wuggy 2026-04-23 22:21:46 -07:00
commit 224f4ac229
2 changed files with 0 additions and 8 deletions

View file

@ -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 += [