Fixed merge errors
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://chhsyc65jertm"
|
||||
uid="uid://hqp23lmk336m"
|
||||
path="res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
|
||||
Reference in New Issue
Block a user