# Conflicts: # Assets/BasicRenderBatching.meta # Assets/BasicRenderBatching/LightingBatching.meta # Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/LitProperties.hlsl # Assets/ScriptableRenderLoop/HDRenderPipeline/PostProcess/Resources/Textures.meta # Assets/ScriptableRenderLoop/HDRenderPipeline/ShaderVariables.hlsl # Assets/TestScenes/HDTest/CascadedShadowsTest.meta # Assets/TestScenes/HDTest/GlobalIlluminationTest/LightingData.asset # Assets/TestScenes/HDTest/GraphicTest/Two Sided/Prefabs/Materials.meta # Assets/TestScenes/HDTest/Leaf.meta # Assets/TestScenes/HDTest/Leaf/GroundLeaf.meta