From 92f7dc5a3bde1b3bd8a47644f467dc2b1a8e3ed5 Mon Sep 17 00:00:00 2001
From: Ian Woods <ianwoods1993@gmail.com>
Date: Tue, 23 Jun 2026 20:38:32 -0700
Subject: [PATCH] fix merge conflicts

---
 Assets/_Project/Definitions.meta | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Assets/_Project/Definitions.meta b/Assets/_Project/Definitions.meta
index a2de22b..672694e 100644
--- a/Assets/_Project/Definitions.meta
+++ b/Assets/_Project/Definitions.meta
@@ -1,9 +1,5 @@
 fileFormatVersion: 2
-<<<<<<< HEAD
-guid: 01de85ee5d8a2014594d9910b1a6ff55
-=======
 guid: cf294cbfb17f5a5d7846479a116fc7b3
->>>>>>> 31b0b5f (adding uncommited files (oops))
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}