merge with dev and resolv conflicts

This commit is contained in:
m0duspwnens
2020-07-10 10:36:48 -04:00
15 changed files with 102 additions and 14 deletions

View File

@@ -8,6 +8,7 @@
"serverUrl": "https://{{ MANAGER }}/sensoroniagents",
"verifyCert": false,
"modules": {
"importer": {},
"statickeyauth": {
"apiKey": "{{ SENSORONIKEY }}"
},