# Conflicts: # SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp # SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h