# Conflicts: # DataStructures/FasterList.cs # ECS/EntityDescriptor.cs # ECS/Extensions/Unity/UnitySumbmissionNodeScheduler.cs # ECS/GenericEntityDescriptor.cs # ECS/IEngine.cs # ECS/IEntityDescriptorHolder.cs # ECS/note.txt # Utilities/Console.cs # Utilities/Murmur3.cs # WeakEvents/WeakAction.cs # WeakEvents/WeakActionStruct.cs # WeakEvents/WeakEvent.cs