Resolved a merge conflict.
This commit is contained in:
parent
4e46143499
commit
5a0de04eb7
|
@ -3,12 +3,9 @@
|
||||||
name="Motion Test"
|
name="Motion Test"
|
||||||
main_scene="res://motion.scn"
|
main_scene="res://motion.scn"
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
[display]
|
[display]
|
||||||
|
|
||||||
width=800
|
width=800
|
||||||
height=600
|
height=600
|
||||||
stretch_mode="2d"
|
stretch_mode="2d"
|
||||||
stretch_aspect="keep"
|
stretch_aspect="keep"
|
||||||
>>>>>>> ab99671bb835a5fe24a092ec34afe1ad862ac254
|
|
||||||
|
|
Loading…
Reference in a new issue