Fix readme merge conflict

Former-commit-id: 258953c20d
pull/1161/head
Dakota Benjamin 2016-11-23 14:49:01 -05:00
commit 96806cab53
1 zmienionych plików z 2 dodań i 2 usunięć

Wyświetl plik

@ -39,7 +39,7 @@ Help improve our software!
(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.
Support for Ubuntu 12.04 is currently BROKEN with the addition of OpenSfM and Ceres-Solver. It is likely to remain broken unless a champion is found to fix it.
### Build OpenDroneMap
Start with the following:
@ -146,7 +146,7 @@ like so:
--rm odm_image
Using this method, the containerized ODM will process the images in the OpenDroneMap/images directory and output results
to the OpenDroneMao/odm_orthophoto and OpenDroneMap/odm_texturing directories as described in the **Viewing Results** section.
to the OpenDroneMap/odm_orthophoto and OpenDroneMap/odm_texturing directories as described in the **Viewing Results** section.
If you want to view other results outside the Docker image simply add which directories you're interested in to the run command in the same pattern
established above. For example, if you're interested in the dense cloud results generated by PMVS and in the orthophoto,
simply use the following `docker run` command after building the image: