diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index 4ee9359..e42efa8 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -55,11 +55,15 @@ MonoBehaviour: - rid: 7752762179098771475 - rid: 7752762179098771476 <<<<<<< Updated upstream +<<<<<<< Updated upstream <<<<<<< Updated upstream - rid: 8239426011147272263 ======= - rid: 3813502762424205379 >>>>>>> Stashed changes +======= + - rid: 3813502762424205379 +>>>>>>> Stashed changes ======= - rid: 3813502762424205379 >>>>>>> Stashed changes