Resolved a merge conflict.

2015-06-13 14:43:12 +03:00 · 2015-06-13 14:43:12 +03:00 · 5a0de04eb7
parent 4e46143499
commit 5a0de04eb7
1 changed files with 0 additions and 3 deletions
--- 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