# Conflicts: # .DS_Store # assets/.DS_Store |
||
|---|---|---|
| assets | ||
| data | ||
| scenes | ||
| scripts | ||
| .editorconfig | ||
| .gitattributes | ||
| .gitignore | ||
| default_bus_layout.tres | ||
| export_presets.cfg | ||
| options.gd | ||
| options.gd.uid | ||
| project.godot | ||
# Conflicts: # .DS_Store # assets/.DS_Store |
||
|---|---|---|
| assets | ||
| data | ||
| scenes | ||
| scripts | ||
| .editorconfig | ||
| .gitattributes | ||
| .gitignore | ||
| default_bus_layout.tres | ||
| export_presets.cfg | ||
| options.gd | ||
| options.gd.uid | ||
| project.godot | ||