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)
commit48cbedc3601f7574fad6a51fcd40aa46347efb9c
tree4f46d9bbf9d6577f56192f4cf0ad91da86254d66
parent37fb701b58f888c3eebf9a0b632f766162aba3b3
parentd647078e05e3e1438ee1a011ee09c3841f4b6e2a
Fixed merge conflic in map.ts