Chris Galvan d7574777a8 Resolved merge conflicts ...

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

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

..

AutoGen

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

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

ConnectionLayer

Resolved merge conflicts

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

DataStructures

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

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

Framework

Resolved merge conflicts

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

PacketLayer

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

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

Serialization

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

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

TcpTransport

Resolved merge conflicts

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

UdpTransport

Resolved merge conflicts

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

Utilities

Resolved merge conflicts

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

aznetworking_files.cmake

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

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

AzNetworkingModule.cpp

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

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

AzNetworkingModule.h

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

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