fix merge issue

diff --git a/dygraph.js b/dygraph.js
index 23d2bcc..0132f50 100644 (file)
--- a/dygraph.js
+++ b/dygraph.js
@@ -1509,6 +1509,7 @@ Dygraph.numericTicks = function(minV, maxV, self, attr) {
     k = 1024;
     k_labels = [ "k", "M", "G", "T" ];
   }
+  var formatter = attr('yAxisLabelFormatter') ? attr('yAxisLabelFormatter') : attr('yValueFormatter'); 
 
   // Allow reverse y-axis if it's explicitly requested.
   if (low_val > high_val) scale *= -1;