Solve conflict #2

2021-05-13 20:31:47 +02:00
parent 5cc53fca02
commit 92f1fc6f4f
14 changed files with 4 additions and 4 deletions
@@ -1,9 +1,9 @@
 [gd_resource type="MeshLibrary" load_steps=17 format=2]

 [ext_resource path="res://assets/materials/gray.tres" type="Material" id=1]
-[ext_resource path="res://assets/props/book/materials/MAT_book.material" type="Material" id=2]
-[ext_resource path="res://assets/props/table/materials/table.material" type="Material" id=3]
-[ext_resource path="res://assets/props/rock floor/materials/rock_floor.material" type="Material" id=4]
+[ext_resource path="res://assets/props/book/materials/MA_book.material" type="Material" id=2]
+[ext_resource path="res://assets/props/table/materials/MA_table.material" type="Material" id=3]
+[ext_resource path="res://assets/props/rock floor/materials/MA_rock_floor.material" type="Material" id=4]

 [sub_resource type="CubeMesh" id=1]
 material = ExtResource( 1 )