fixed merge issue
authorJordan Augé <jordan.auge@lip6.fr>
Fri, 29 Nov 2013 09:40:32 +0000 (10:40 +0100)
committerJordan Augé <jordan.auge@lip6.fr>
Fri, 29 Nov 2013 09:40:32 +0000 (10:40 +0100)
commit0cb9639cd2b26d8836dc61d40d2028d6fda95b1b
tree405dc64fdf9a95683ad4a71bfa03bfc997103e93
parentf4201a3e21c8623dbe74f707b1841e8c912f573b
fixed merge issue
plugins/googlemap/static/js/googlemap.js