Chris Galvan 04a00e6a54 Resolved latest merge conflicts ...

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

2021-07-02 13:29:55 -05:00

..

Editor

Resolved latest merge conflicts

2021-07-02 13:29:55 -05:00

Framework

Resolved latest merge conflicts

2021-07-02 13:29:55 -05:00

LauncherUnified

Resolved merge conflicts

2021-07-02 12:42:44 -05:00

Legacy

Resolved merge conflicts

2021-07-02 12:42:44 -05:00

Tools

Resolved merge conflicts

2021-07-02 12:42:44 -05:00

CMakeLists.txt

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00