Solve merge issue

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-09-29 09:58:04 -07:00
parent 3b9c3f832a
commit 94bd95cee3
1 changed files with 1 additions and 4 deletions
@@ -39,11 +39,8 @@

 #include <AzCore/Asset/AssetSerializer.h>
 #include <AzCore/Casting/numeric_cast.h>
-<<<<<<< HEAD
-#include <AzFramework/API/ApplicationAPI.h>
-=======
 #include <AzCore/std/algorithm.h>
->>>>>>> a8559c4000297b8c2876b8213d83f1678dbc3d84
+#include <AzFramework/API/ApplicationAPI.h>
 #include <AzToolsFramework/Viewport/ViewportMessages.h>

 #include <LmbrCentral/Audio/AudioSystemComponentBus.h>