diff options
| author | Bojidar Marinov <bojidar.marinov.bg@gmail.com> | 2015-06-13 14:43:12 +0300 |
|---|---|---|
| committer | Bojidar Marinov <bojidar.marinov.bg@gmail.com> | 2015-06-13 14:43:12 +0300 |
| commit | 5a0de04eb739606a49ba828634c051c0e7552291 (patch) | |
| tree | 12ab183d56b8fa2fcc14dbaeda74a086c1749242 /demos/2d | |
| parent | 4e46143499be0e40ae29eff550cbeec4ebde3d85 (diff) | |
Resolved a merge conflict.
Diffstat (limited to 'demos/2d')
| -rw-r--r-- | demos/2d/motion/engine.cfg | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/demos/2d/motion/engine.cfg b/demos/2d/motion/engine.cfg index 29c4d0da20..261111904c 100644 --- a/demos/2d/motion/engine.cfg +++ b/demos/2d/motion/engine.cfg @@ -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 |