Resolved merge conflixts
authorJulie Hill Roa <julie.hill.roa@gmail.com>
Thu, 3 Dec 2015 17:55:25 +0000 (18:55 +0100)
committerJulie Hill Roa <julie.hill.roa@gmail.com>
Thu, 3 Dec 2015 17:55:25 +0000 (18:55 +0100)
commitbc2f4c9ee84268b1753008abff851c3f2ab6668c
treed5c15a27e801b343d338a413d6166eb1720d9aca
parent59ab0e7ab121ce9fcf6c161d46931ba967c409e5
parent59ffa1e6b81bb738724559e30979376c0320e327
Resolved merge conflixts
src/components/map/map.ts