[BUGFIX] cherry-picking

3liz · Dec 31, 2014 · c55fe39 · c55fe39
1 parent 4c84904
commit c55fe39
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/lizmap/www/js/map.js b/lizmap/www/js/map.js
@@ -1898,14 +1898,6 @@ var lizMap = function() {
   }
 
   function getPrintScale( aScales ) {
-<<<<<<< HEAD
-	  var scale = map.getScale();
-	  var scaleIdx = aScales.indexOf( scale );
-	  if ( scaleIdx == -1 ) {
-		var s=0, slen=aScales.length;
-		while ( scaleIdx == -1 && s<slen ) {
-			if ( scale > aScales[s] )
-=======
       var newScales = [];
       for ( var i=0, len = aScales.length; i<len; i++ ) {
           newScales.push( parseFloat(aScales[i]) );