Skip to content

Commit

Permalink
Fixed merge conflict.
Browse files Browse the repository at this point in the history
  • Loading branch information
blythest committed Jan 7, 2016
2 parents ac13c57 + c59261e commit 95a1bb9
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion js/style/style.js
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,6 @@ Style.prototype = util.inherit(Evented, {
_forwardTileEvent: function(e) {
if (e.type === 'tile.load') {
if (this.loaded() === true) {
console.info('are all the tiles loaded? ', this.loaded());
this.fire('tiles.loaded');
}
}
Expand Down

0 comments on commit 95a1bb9

Please sign in to comment.