Merge remote-tracking branch 'origin/master' into composite

This commit is contained in:
Gregory Nutt 2017-07-16 08:54:23 -06:00
commit 1882fe3200

View File

@ -735,7 +735,7 @@ int disconn_main(int argc, char *argv[])
if (argc == 2) if (argc == 2)
{ {
instance = atoi(argv[1]); config = atoi(argv[1]);
} }
else if (argc > 2) else if (argc > 2)
{ {