Commit c2990686 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

fix aut. merge issue

parent bc259dc0
Loading
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
#!/usr/bin/env python3

#
<<<<<<< HEAD
#  (C) 2022-2026 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
=======
#  (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
>>>>>>> main
#  Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
#  Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
#  Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other