fixed a merge conflict. No change to master code, so this commit is not tagged

11 years ago · abeac917da
parent 086e0e5d9e
commit abeac917da
2 changed files with 2 additions and 3 deletions
--- a/nv.d3.js
+++ b/nv.d3.js
@ -3537,8 +3537,7 @@ nv.models.indentedTree = function() {


  return chart;
-};
-nv.models.legend = function() {
+};nv.models.legend = function() {

  //============================================================
  // Public Variables with Default Settings
--- a/src/models/indentedTree.js
+++ b/src/models/indentedTree.js
@ -314,4 +314,4 @@ nv.models.indentedTree = function() {


  return chart;
-};
+};