From c97451aac5bfb3d6916bacb3d9765be11df023d9 Mon Sep 17 00:00:00 2001
From: Anthony Wilcox <35226681+tomiscw@users.noreply.github.com>
Date: Sun, 6 Jan 2019 12:53:53 -0500
Subject: [PATCH] p010619 merge conflict fix 2

---
 project/ModernScn.tscn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ModernScn.tscn b/project/ModernScn.tscn
index ac93505..e8ebed2 100644
--- a/project/ModernScn.tscn
+++ b/project/ModernScn.tscn
@@ -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 )]