# Conflicts: # Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader # Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl # Assets/ScriptableRenderPipeline/HDRenderPipeline/ShaderVariables.hlsl # Assets/TestScenes/HDTest/GlobalIlluminationTest.unity # ProjectSettings/EditorBuildSettings.asset # ProjectSettings/ProjectVersion.txt # ProjectSettings/QualitySettings.asset