# Conflicts:
#	My project/Assets/Scenes/MCQ/OLD MSQ.unity
#	My project/Assets/ScienceStreet/CS/Scripts/CsGameManager.cs
#	My project/UserSettings/EditorUserSettings.asset
#	My project/UserSettings/Layouts/CurrentMaximizeLayout.dwlt