[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)
commit064d7ca660843b31768ae673939010f238a37ec7
treecdda1334e08566a64992a192ad8f28e9b4753d05
parent15b422d558f3fffe84d9eacc60c794220dd71aab
parentde104b6dd548e6627d6da3d64a1898ce718f0984
[stylegeojson] merge conflict resolved