Fixed merge problem.

Somehow there was a missing comma in the JSON, making it unloadable.
This commit is contained in:
Roger Labbe 2015-05-01 06:58:02 -07:00
parent cd8c170b7c
commit 4fef1138f7

File diff suppressed because one or more lines are too long