[fix] merge fix
authorErik Haider Forsén <erikhf@ifi.uio.no>
Thu, 3 Dec 2015 14:29:20 +0000 (15:29 +0100)
committerErik Haider Forsén <erikhf@ifi.uio.no>
Thu, 3 Dec 2015 14:29:20 +0000 (15:29 +0100)
commit0fc3af964f2d19edf11771e59a09369a208ade38
treef4cabde4128c29e1ab775e26506f718ec7e5db80
parent33b253bf27a8e65d45d50609085f8b1a0354507a
[fix] merge fix
src/components/map/map.html
src/components/map/map.ts