"Resoving merge conflcts"

This commit is contained in:
darapan
2021-06-25 08:19:23 -07:00
parent 72ed95f095
commit 7d833b87a5
@@ -40,6 +40,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
AutomatedTesting.GameLauncher
AutomatedTesting.Assets
COMPONENT
Smoke
Sandbox
)
endif()
endif()