Permalink
Browse files

Merge branch 'master' into my_new_feature

  • Loading branch information...
2 parents 6baaaea + 2f384d5 commit 657ea9aa89f43339a03ee2966bb77929e6b050f8 Sean McCullough committed Mar 22, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 js/map.js
View
@@ -30,7 +30,7 @@ $( function () {
title:"Hello World!"
});
var infowindow = new google.maps.InfoWindow({
- content: "FOO BAR"
+ content: "FOO this works BAR"
});
google.maps.event.addListener(marker, 'click', function() {
infowindow.open(map,marker);

0 comments on commit 657ea9a

Please sign in to comment.