DRTVWR-510: Fix merge conflict

doc/contributions.txt

indra/llaudio/llaudiodecodemgr.cpp

indra/llcommon/llprocessor.cpp

indra/llcommon/llsdserialize.cpp

indra/llcorehttp/_httpservice.cpp

indra/llcorehttp/bufferarray.cpp

indra/llimage/llimagejpeg.cpp

indra/llimage/llpngwrapper.cpp

indra/llmath/llvolume.cpp

indra/llmessage/llcorehttputil.cpp

indra/llmessage/llhttpnode.cpp

indra/llrender/llgl.cpp

indra/llrender/llgl.h

indra/llrender/llglheaders.h

indra/llui/tests/llurlentry_test.cpp

indra/llwindow/lldxhardware.cpp

indra/llwindow/lldxhardware.h

indra/llwindow/llwindowwin32.cpp

indra/newview/VIEWER_VERSION.txt

indra/newview/llagent.cpp