# Conflicts:
#	My project/Assets/Prefabs/CS/Canvas.prefab
#	My project/Assets/ScienceStreet/CS/Scripts/CsUIManager.cs
#	My project/Assets/WebGLTemplates.meta
#	My project/Assets/WebGLTemplates/InteractiveVideo/Logo.png
#	My project/Assets/WebGLTemplates/InteractiveVideo/index.html
#	My project/Assets/WebGLTemplates/InteractiveVideo/index.html.meta
#	My project/UserSettings/EditorUserSettings.asset
#	My project/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
#	My project/UserSettings/Layouts/default-6000.dwlt