tonytins/dressupzack
1
0
Fork 0
mirror of https://github.com/tonytins/dressupzack synced 2025-05-07 14:04:48 -04:00
Code Issues Releases Wiki Activity

p010619 merge conflict fix 2

Browse source
This commit is contained in:
Anthony Wilcox 2019-01-06 12:53:53 -05:00
parent bca7eff89e
commit c97451aac5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
project/ModernScn.tscn
View file

@ -5,7 +5,7 @@
[ext_resource path="res://assets/icrazy_frame.png" type="Texture" id=3]
[ext_resource path="res://Zack.tscn" type="PackedScene" id=4]
[ext_resource path="res://Clothes.tscn" type="PackedScene" id=5]
[ext_resource path="res://Interface.tscn" type="PackedScene" id=6]
[ext_resource path="res://WinDialogs.tscn" type="PackedScene" id=6]
[node name="GameScreen" type="Node" index="0"]
@ -31,6 +31,6 @@ __meta__ = {
[node name="Clothes" parent="." index="3" instance=ExtResource( 5 )]
[node name="Interface" parent="." index="4" instance=ExtResource( 6 )]
[node name="WinDialogs" parent="." index="4" instance=ExtResource( 6 )]