summaryrefslogtreecommitdiff
path: root/controller
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2015-09-14 12:00:03 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2015-09-14 12:00:03 -0700
commitd06499a50cb30867b58a329206ee1a98f2b575ec (patch)
tree85ab1accc25bd6ee1249d13cb087c56a93855034 /controller
parent0617b1753443a82267dde9fa0c76e8f7d3ce1cc4 (diff)
parentef316ced3bf52434eab34490b3f12b8d080c9252 (diff)
downloadinfinitytier-d06499a50cb30867b58a329206ee1a98f2b575ec.tar.gz
infinitytier-d06499a50cb30867b58a329206ee1a98f2b575ec.zip
Merge branch 'adamierymenko-dev' of http://git.int.zerotier.com/zerotier/zerotierone into netcon
Diffstat (limited to 'controller')
-rw-r--r--controller/SqliteNetworkController.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/controller/SqliteNetworkController.cpp b/controller/SqliteNetworkController.cpp
index f7d95666..e1e6c9cd 100644
--- a/controller/SqliteNetworkController.cpp
+++ b/controller/SqliteNetworkController.cpp
@@ -1026,7 +1026,7 @@ unsigned int SqliteNetworkController::_doCPGet(
testFields.push_back('"');
}
testFields.append("\n\t\t}\n");
- testFields.append("\t}\n");
+ testFields.append("\t},\n");
}
}