Skip to content

Commit

Permalink
Merge branch 'develop' into feature/update-grunt-packages-and-eslint-…
Browse files Browse the repository at this point in the history
…rules
  • Loading branch information
tmcgee committed Apr 12, 2016
2 parents bb4614c + 069b500 commit 4594aff
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion viewer/js/gis/dijit/Basemaps.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ define([
startup: function () {
this.inherited(arguments);
if (this.mapStartBasemap) {
this.currentBasemap = this.mapStartBasemap;
if (this.map.getBasemap() !== this.mapStartBasemap) {
this.updateBasemap(this.mapStartBasemap);
}
Expand Down

0 comments on commit 4594aff

Please sign in to comment.