From 94bd95cee3340632bdf637742fe00ae1f1e308eb Mon Sep 17 00:00:00 2001
From: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
Date: Wed, 29 Sep 2021 09:58:04 -0700
Subject: [PATCH] Solve merge issue

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
---
 Code/Editor/ViewportTitleDlg.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Code/Editor/ViewportTitleDlg.cpp b/Code/Editor/ViewportTitleDlg.cpp
index 20b6ac9483..75d16e9a40 100644
--- a/Code/Editor/ViewportTitleDlg.cpp
+++ b/Code/Editor/ViewportTitleDlg.cpp
@@ -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>