Merge fix

Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
This commit is contained in:
Dayo Lawal
2021-08-05 14:07:48 -05:00
parent f8c8181b0c
commit bf7512ebf4
6 changed files with 37 additions and 59 deletions
@@ -26,7 +26,6 @@ namespace MaterialEditor
using Base = AtomToolsFramework::AtomToolsApplication;
MaterialEditorApplication(int* argc, char*** argv);
virtual ~MaterialEditorApplication();
//////////////////////////////////////////////////////////////////////////
// AzFramework::Application