CodingPirates/godot-demo-projects
1
0
Fork 0
mirror of https://github.com/godotengine/godot-demo-projects.git synced 2026-01-08 17:00:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolved a merge conflict.

Browse Source
This commit is contained in:
Bojidar Marinov
2015-06-13 14:43:12 +03:00
parent 75bda82220
commit b8b3b0ff57
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
2d/motion/engine.cfg
View File

@@ -3,12 +3,9 @@
name="Motion Test"
main_scene="res://motion.scn"
<<<<<<< HEAD
=======
[display]
width=800
height=600
stretch_mode="2d"
stretch_aspect="keep"
>>>>>>> ab99671bb835a5fe24a092ec34afe1ad862ac254