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

2017-07-16 08:54:23 -06:00 · 2017-07-16 08:54:23 -06:00 · 1882fe3200
commit 1882fe3200
parent c7f8540169 7b9ec306db
1 changed files with 1 additions and 1 deletions
--- a/system/composite/composite_main.c
+++ b/system/composite/composite_main.c
@ -735,7 +735,7 @@ int disconn_main(int argc, char *argv[])

  if (argc == 2)
    {
-      instance = atoi(argv[1]);
+      config = atoi(argv[1]);
    }
  else if (argc > 2)
    {