[stylegeojson] merge conflict resolved
authorJulie Hill Roa <julie.hill.roa@gmail.com>
Thu, 3 Dec 2015 11:53:13 +0000 (12:53 +0100)
committerJulie Hill Roa <julie.hill.roa@gmail.com>
Thu, 3 Dec 2015 11:53:13 +0000 (12:53 +0100)

Trivial merge