Commit 5e79e868 authored by Cédric Traizet's avatar Cédric Traizet
Browse files

COMP: resolve merge conflict

parents 12ec94ae 1d3baef0
......@@ -58,7 +58,8 @@ protected:
"regression.\nThis application is based on LibSVM, OpenCV Machine "
"Learning (2.3.1 and later), and Shark ML The output of this application "
"is a text model file, whose format corresponds to the ML model type "
"chosen. There is no image nor vector data output.");
"chosen. There is no image or vector data output.");
SetDocAuthors("OTB Team");
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment