More merge conflicts. Taking main changes then will integrate mine.
11 lines
326 B
Plaintext
11 lines
326 B
Plaintext
{
|
|
"BuildId": "827e4aed-aff1-4853-85bd-51def0d581c9",
|
|
"Modules":
|
|
{
|
|
"CoreUtility": "UnrealEditor-CoreUtility.dll",
|
|
"SIOJEditorPlugin": "UnrealEditor-SIOJEditorPlugin.dll",
|
|
"SIOJson": "UnrealEditor-SIOJson.dll",
|
|
"SocketIOClient": "UnrealEditor-SocketIOClient.dll",
|
|
"SocketIOLib": "UnrealEditor-SocketIOLib.dll"
|
|
}
|
|
} |