josh adams 4dcd9d29ad - Fixed conflict from a merge to main ...

#rb trivial
#jira none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4846991 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4846993 by josh adams in Dev-VR branch]

2019-01-30 15:28:07 -05:00

..

IPlatformFilePak.cpp

- Fixed conflict from a merge to main

2019-01-30 15:28:07 -05:00

SignedArchiveReader.cpp

Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)

2019-01-28 13:51:09 -05:00

SignedArchiveReader.h

Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)

2019-01-17 18:54:05 -05:00