Fix conflict due to text.

Former-commit-id: cf25c27f75

README.md

@@ -43,7 +43,8 @@ Steps to get OpenDroneMap running:
 (Requires Ubuntu 14.04 or later, see https://github.com/OpenDroneMap/odm_vagrant for running on Windows in a VM)
 
 Support for Ubuntu 12.04 is currently BROKEN with the addition of OpenSfM and Ceres-Solver. We are working hard to get it working again in the future.
-=======
+
+>>>>>>> 15fa661bc8fabc98be2f153e44c0f5b94ade84af
 #### Building OpenDroneMap using git
 
     cd path/to/odm/dir