Merge pull request #2080 from bojidar-bg/patch-1

Fix to #2079

2d/fog_of_war/.fscache

@@ -1,11 +0,0 @@
-::res://::1422910453
-floor.png::ImageTexture::1422910453::
-fog.gd::GDScript::1422910025::
-fog.png::ImageTexture::1422908128::
-fog.scn::PackedScene::1422909435::
-fog.xml::TileSet::1422909324::
-icon.png::ImageTexture::1422811193::
-tile_edit.scn::PackedScene::1422909313::
-troll.gd::GDScript::1422909940::
-troll.png::ImageTexture::1418669358::
-troll.scn::PackedScene::1418669358::

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