Browse Source

Fix conflict

pull/274/head
Masayuki Tanaka 11 years ago
parent
commit
2ec9809cb7
  1. 3
      c3.js
  2. 6
      c3.min.js

3
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) {

6
c3.min.js vendored

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save