Commit 66b810f8 authored by Manuel Jander's avatar Manuel Jander
Browse files

Resolve merge conflict.

parent dcdf4597

lib_enc/ivas_core_pre_proc_front_fx.c

+1 −1

File changed.

Contains only whitespace changes.

lib_enc/ivas_cpe_enc_fx.c

+1 −1

File changed.

Contains only whitespace changes.