Fix merge conflict (CLIMATE-465)
authorAlex <agoodm@users.noreply.github.com>
Sat, 2 Dec 2017 08:16:11 +0000 (00:16 -0800)
committerAlex <agoodm@users.noreply.github.com>
Sat, 2 Dec 2017 08:16:11 +0000 (00:16 -0800)
commit2d30ef8ed998df3cfaba1b53ea17eefae6872a5c
treead72872b68520f0e3c0d0bb8d25e4866d1d3cf6f
parent8b5de9c41c11edbdbb006fdc3cb9e2831a40ff18
parentda7e5a00dafa5165aecc61fd2beecc02e879bf11
Fix merge conflict (CLIMATE-465)