mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

hatred

Browse source 
trying to solve conflicts
This commit is contained in:
Obelisk 2024-03-05 07:32:17 -03:00
parent b70070cb39
commit 88f30f7778
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Assets/Resources/Fonts/Kurokane.asset
View file

@ -1,3 +1,4 @@
<<<<<<< Updated upstream
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000 --- !u!114 &11400000
@ -2951,3 +2952,5 @@ Texture2D:
offset: 0 offset: 0
size: 0 size: 0
path: path:
=======
>>>>>>> Stashed changes