From 88f30f7778e28d8457aeed147e841d7b11938999 Mon Sep 17 00:00:00 2001
From: Obelisk <taynaluan10@gmail.com>
Date: Tue, 5 Mar 2024 07:32:17 -0300
Subject: [PATCH] hatred

trying to solve conflicts
---
 Assets/Resources/Fonts/Kurokane.asset | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Assets/Resources/Fonts/Kurokane.asset b/Assets/Resources/Fonts/Kurokane.asset
index 86e4343ab..73ce071fb 100644
--- a/Assets/Resources/Fonts/Kurokane.asset
+++ b/Assets/Resources/Fonts/Kurokane.asset
@@ -1,3 +1,4 @@
+<<<<<<< Updated upstream
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
 --- !u!114 &11400000
@@ -2951,3 +2952,5 @@ Texture2D:
     offset: 0
     size: 0
     path: 
+=======
+>>>>>>> Stashed changes