From 9926d6c24f6625d60ab18781a0b0324e3a6a62c3 Mon Sep 17 00:00:00 2001
From: timote koenig <timote.koenig@epitech.eu>
Date: Thu, 23 Apr 2026 13:51:06 +0200
Subject: [PATCH] fix: remove merge confilct from PC_Renderer.asset

---
 AGENTS.md                         | 4 ++--
 Assets/Settings/PC_Renderer.asset | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index 54bc674..9a72719 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -2,7 +2,7 @@
 - Project name: HeadlessHazard
 - Unity version: Unity 6000.3.10f1
 - Active game object:
-  - Name: Button_3
-  - Tag: Untagged
+  - Name: Player
+  - Tag: Player
   - Layer: Default
 <!-- UNITY CODE ASSIST INSTRUCTIONS END -->
\ No newline at end of file
diff --git a/Assets/Settings/PC_Renderer.asset b/Assets/Settings/PC_Renderer.asset
index c110d16..9e7d926 100644
--- a/Assets/Settings/PC_Renderer.asset
+++ b/Assets/Settings/PC_Renderer.asset
@@ -51,8 +51,7 @@ MonoBehaviour:
     probeVolumeBlendStatesCS: {fileID: 7200000, guid: b9a23f869c4fd45f19c5ada54dd82176, type: 3}
   m_RendererFeatures:
   - {fileID: 7833122117494664109}
-  - {fileID: -4377071725885749089}
-  m_RendererFeatureMap: ad6b866f10d7b46c9f882cbe748441c3
+  m_RendererFeatureMap: ad6b866f10d7b46c
   m_UseNativeRenderPass: 1
   xrSystemData: {fileID: 0}
   postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}