# Conflicts: # .github/workflows/qatest.yaml # indra/llcommon/llsdutil.h # indra/newview/llinventorybridge.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitgallery.h # indra/newview/skins/default/xui/ja/strings.xml