# Conflicts: # FreeCam/Assets/BlockSpawner.cs # FreeCam/Assets/Effects/wMaillageShader.shader # FreeCam/Assets/Effects/wMaillageShader.shader.meta # FreeCam/Assets/Materials/New Material.mat