From 7d833b87a5a5d89e93abb4fc77b2de8dca49eb1b Mon Sep 17 00:00:00 2001 From: darapan Date: Fri, 25 Jun 2021 08:19:23 -0700 Subject: [PATCH] "Resoving merge conflcts" --- AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt index a3b6e36250..141dfa0a45 100644 --- a/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt +++ b/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt @@ -40,6 +40,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS) AutomatedTesting.GameLauncher AutomatedTesting.Assets COMPONENT - Smoke + Sandbox ) -endif() \ No newline at end of file +endif()