From 16b58dcbaf167c0553595ef341a140416ea121e6 Mon Sep 17 00:00:00 2001
From: Michael Rausch <mra106@uclive.ac.nz>
Date: Wed, 8 Mar 2017 14:19:54 +1300
Subject: [PATCH] Fixed conflict

---
 doc/examples/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/examples/config.json b/doc/examples/config.json
index 67e8ea56..df6261b0 100644
--- a/doc/examples/config.json
+++ b/doc/examples/config.json
@@ -1,6 +1,6 @@
 {
   "race-name": "AC35",
-  "time-scale": 1,
+  "time-scale": 1.0,
   "race-size": 4,
   "teams": [
     {"team-name": "Oracle Team USA", "velocity": 20.9},