Fixed conflict

This commit is contained in:
Michael Rausch
2017-03-08 14:19:54 +13:00
parent 92556fffca
commit 16b58dcbaf
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"race-name": "AC35", "race-name": "AC35",
"time-scale": 1, "time-scale": 1.0,
"race-size": 4, "race-size": 4,
"teams": [ "teams": [
{"team-name": "Oracle Team USA", "velocity": 20.9}, {"team-name": "Oracle Team USA", "velocity": 20.9},