Fix merge conflict

2015-07-19 16:23:18 -04:00
parent a710944218 f918ea38cd
commit 019bc8c057
4 changed files with 8 additions and 4 deletions
--- a/example.config.json
+++ b/example.config.json
@@ -1,6 +1,7 @@
 {
  "api_url": "https://demo.cachethq.io/api",
  "api_token": "9yMHsdioQosnyVK4iCVR",
+  "interval": 60,
  "monitors": [
    {
      "name": "nodegear frontend",