From c94eee24c4075d9ffba5b37635a9743aeaa45c67 Mon Sep 17 00:00:00 2001
From: Dan Vanderkam <danvdk@gmail.com>
Date: Sun, 17 Oct 2010 20:42:03 -0400
Subject: [PATCH] fix merge issue

---
 dygraph.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dygraph.js b/dygraph.js
index 23d2bcc..0132f50 100644
--- 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;
-- 
2.7.4