Fixed merge conflict.

Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-25 16:13:22 -05:00
parent d211771253 45b2336dce
commit 4b672a0a32
148 changed files with 1583 additions and 16213 deletions
@@ -13,6 +13,7 @@

 // CryCommon
 #include <CryCommon/Maestro/Types/AnimParamType.h>
+#include <CryCommon/IFont.h>

 // Editor
 #include "Settings.h"