Fixed merge conflicts when merging with origin/nvd3-UI-134

11 years ago · 5f3e6d5691
parent 1eb01d703d
commit 5f3e6d5691
1 changed files with 1 additions and 0 deletions
--- a/test/lineChartTest.html
+++ b/test/lineChartTest.html
@ -3,6 +3,7 @@

 <link href="../src/nv.d3.css" rel="stylesheet" type="text/css">
 <link href="teststyle.css" rel="stylesheet" type='text/css'>
+
 <body>
  <h3>Line chart test cases - feel free to add more tests</h3>
  <div class='chart full' id='chart1'>