summaryrefslogtreecommitdiff
path: root/demos/2d/motion/engine.cfg
diff options
context:
space:
mode:
Diffstat (limited to 'demos/2d/motion/engine.cfg')
-rw-r--r--demos/2d/motion/engine.cfg3
1 files changed, 3 insertions, 0 deletions
diff --git a/demos/2d/motion/engine.cfg b/demos/2d/motion/engine.cfg
index 261111904c..29c4d0da20 100644
--- a/demos/2d/motion/engine.cfg
+++ b/demos/2d/motion/engine.cfg
@@ -3,9 +3,12 @@
name="Motion Test"
main_scene="res://motion.scn"
+<<<<<<< HEAD
+=======
[display]
width=800
height=600
stretch_mode="2d"
stretch_aspect="keep"
+>>>>>>> ab99671bb835a5fe24a092ec34afe1ad862ac254