From 5a86567a97e53771c5b9235736a9f0fddf0d0329 Mon Sep 17 00:00:00 2001 From: Oier Bravo Urtasun Date: Tue, 13 Feb 2024 00:12:22 +0100 Subject: [PATCH] fix merge --- project.godot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.godot b/project.godot index 3613b5e0..91f4c420 100644 --- a/project.godot +++ b/project.godot @@ -118,7 +118,6 @@ _global_script_classes=[ { "class": "ESCActionManagerMonkey", "language": "GDScript", "path": "res://addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd" -"path": "res://addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd" }, { "base": "Resource", "class": "ESCAnimationName", @@ -940,6 +939,7 @@ search_in_file_extensions=PoolStringArray( "gd", "shader", "esc" ) [editor_plugins] enabled=PoolStringArray( "res://addons/escoria-core/plugin.cfg", "res://addons/escoria-ui-return-monkey-island/plugin.cfg", "res://addons/escoria-ui-return-monkey-island-dialog-simple/plugin.cfg" ) +<<<<<<