Fixed merge conflic in map.ts
authorYrjan A. F. Fraschetti <yrjanaff@1x-193-157-214-191.uio.no>
Thu, 3 Dec 2015 07:26:38 +0000 (08:26 +0100)
committerYrjan A. F. Fraschetti <yrjanaff@1x-193-157-214-191.uio.no>
Thu, 3 Dec 2015 07:26:38 +0000 (08:26 +0100)

Trivial merge