Fix conflict

2ec9809c · Masayuki Tanaka · facf083d · fef74579 · 2ec9809c · 2ec9809c
Commit 2ec9809c authored May 27, 2014 by Masayuki Tanaka
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

c3.js c3.js +1 -2

c3.min.js c3.min.js +0 -0

No files found.
--- a/c3.js
+++ b/c3.js
@@ -5102,8 +5102,7 @@
            }
            return newScale;
        }
-        function textFormatted(i) {
-            var v = isCategory && i < categories.length ? categories[i] : i;
+        function textFormatted(v) {
            return tickFormat ? tickFormat(v) : v;
        }
        function axis(g) {

--- a/c3.min.js
+++ b/c3.min.js