10 years ago · b8b3b0ff57
--- a/2d/motion/engine.cfg
+++ b/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