fix merge
This commit is contained in:
@@ -118,7 +118,6 @@ _global_script_classes=[ {
|
|||||||
"class": "ESCActionManagerMonkey",
|
"class": "ESCActionManagerMonkey",
|
||||||
"language": "GDScript",
|
"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"
|
||||||
"path": "res://addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd"
|
|
||||||
}, {
|
}, {
|
||||||
"base": "Resource",
|
"base": "Resource",
|
||||||
"class": "ESCAnimationName",
|
"class": "ESCAnimationName",
|
||||||
@@ -940,6 +939,7 @@ search_in_file_extensions=PoolStringArray( "gd", "shader", "esc" )
|
|||||||
[editor_plugins]
|
[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" )
|
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" )
|
||||||
|
<<<<<<<HEADenabled=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" )
|
||||||
|
|
||||||
[escoria]
|
[escoria]
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user