From 83e0012a3f2325012df9fde812d64717471d6c06 Mon Sep 17 00:00:00 2001
From: Qloree32 <qloree@oakland.edu>
Date: Mon, 27 Jan 2025 13:34:41 -0500
Subject: [PATCH] pixel art test

pixel art test
---
 Assets/Settings/UniversalRenderPipelineGlobalSettings.asset | 4 ++++
 1 file changed, 4 insertions(+)

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